Module: sip-router Branch: jason.penton/kamailio_ims_extensions Commit: 39fb23f2e9bd6e7cc98d22a64d8495ee406cea9d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=39fb23f2...

Author: Jason Penton jason.penton@gmail.com Committer: Jason Penton jason.penton@gmail.com Date: Fri Oct 21 16:49:07 2011 +0200

Revert "TM: moved fake reply wrapper to t_reply as opposed to t_cancel" - This is not required anymore

This reverts commit 831ab80feec836dbfc7f4e497b590f7e76252b35.

---

modules/tm/t_cancel.c | 8 ++++++++ modules/tm/t_cancel.h | 3 +++ modules/tm/t_reply.c | 6 ------ modules/tm/t_reply.h | 2 -- 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/modules/tm/t_cancel.c b/modules/tm/t_cancel.c index 5b7d666..ac1bf4f 100644 --- a/modules/tm/t_cancel.c +++ b/modules/tm/t_cancel.c @@ -65,6 +65,8 @@ #include "t_msgbuilder.h" #include "t_lookup.h" /* for t_lookup_callid in fifo_uac_cancel */ #include "t_hooks.h" +#include "timer.h" +

/** Prepare to cancel a transaction. * Determine which branches should be canceled and prepare them (internally @@ -541,3 +543,9 @@ error3: return ret; }

+ +void w_fake_reply(struct cell *t, int branch, int code ) +{ + LOCK_REPLIES(t); + fake_reply(t, branch, code); +} diff --git a/modules/tm/t_cancel.h b/modules/tm/t_cancel.h index 7e446f1..8b44cc9 100644 --- a/modules/tm/t_cancel.h +++ b/modules/tm/t_cancel.h @@ -96,6 +96,9 @@ typedef int (*cancel_all_uacs_f)(struct cell *trans, int how); typedef void (*prepare_to_cancel_f)(struct cell *t, branch_bm_t *cancel_bm, branch_bm_t skip_branches);

+void w_fake_reply(struct cell *t, int branch, int code ); + + /** Check if one branch needs CANCEL-ing and prepare it if it does. * Can be called w/o REPLY_LOCK held * between this call and the call to cancel_uacs()/cancel_branch() diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 121e597..b7c3a84 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -2629,9 +2629,3 @@ void rpc_reply(rpc_t* rpc, void* c) return; } } - -void w_fake_reply(struct cell *t, int branch, int code ) -{ - LOCK_REPLIES(t); - fake_reply(t, branch, code); -} diff --git a/modules/tm/t_reply.h b/modules/tm/t_reply.h index fd189b2..1fe81ad 100644 --- a/modules/tm/t_reply.h +++ b/modules/tm/t_reply.h @@ -237,6 +237,4 @@ void free_faked_req(struct sip_msg *faked_req, struct cell *t); typedef int (*tget_picked_f)(void); int t_get_picked_branch(void);

-void w_fake_reply(struct cell *t, int branch, int code ); - #endif