[sr-dev] git:jason.penton/kamailio_ims_extensions: TM: moved fake reply wrapper to t_reply as opposed to t_cancel

Module: sip-router Branch: jason.penton/kamailio_ims_extensions Commit: 104f34d8d87831461b89ec0a01fd21fd6018952b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=104f34d… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Thu Oct 20 14:58:05 2011 +0200 TM: moved fake reply wrapper to t_reply as opposed to t_cancel - a little cleanup --- 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, 8 insertions(+), 11 deletions(-) diff --git a/modules/tm/t_cancel.c b/modules/tm/t_cancel.c index ac1bf4f..5b7d666 100644 --- a/modules/tm/t_cancel.c +++ b/modules/tm/t_cancel.c @@ -65,8 +65,6 @@ #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 @@ -543,9 +541,3 @@ 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 8b44cc9..7e446f1 100644 --- a/modules/tm/t_cancel.h +++ b/modules/tm/t_cancel.h @@ -96,9 +96,6 @@ 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 b7c3a84..121e597 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -2629,3 +2629,9 @@ 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 1fe81ad..fd189b2 100644 --- a/modules/tm/t_reply.h +++ b/modules/tm/t_reply.h @@ -237,4 +237,6 @@ 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