diff --git a/src/modules/tm/t_append_branches.c b/src/modules/tm/t_append_branches.c index c3af69a6ae5..6f0d5e7bc9e 100644 --- a/src/modules/tm/t_append_branches.c +++ b/src/modules/tm/t_append_branches.c @@ -50,7 +50,7 @@ int t_append_branches(void) { struct cell *t = NULL; struct sip_msg *orig_msg = NULL; static struct sip_msg faked_req; - + short outgoings; int success_branch; @@ -110,10 +110,10 @@ int t_append_branches(void) { } if (!fake_req(&faked_req, orig_msg, 0, NULL)) { - LOG(L_ERR, "ERROR: t_append_branches: fake_req failed\n"); + LM_ERR("fake_req failed\n"); return -1; } - + /* fake also the env. conforming to the fake msg */ faked_env( t, &faked_req, 0); @@ -128,7 +128,7 @@ int t_append_branches(void) { for (i=0; iuac[i].ruid.len == ruid.len && !memcmp(t->uac[i].ruid.s, ruid.s, ruid.len) - && t->uac[i].uri.len == current_uri.len + && t->uac[i].uri.len == current_uri.len && !memcmp(t->uac[i].uri.s, current_uri.s, current_uri.len)) { LM_DBG("branch already added [%.*s]\n", ruid.len, ruid.s); found = 1; @@ -144,8 +144,9 @@ int t_append_branches(void) { &path, 0, si, faked_req.fwd_send_flags, PROTO_NONE, (dst_uri.len)?0:UAC_SKIP_BR_DST_F, &instance, &ruid, &location_ua); - - LM_DBG("added branch [%.*s] with ruid [%.*s]\n", current_uri.len, current_uri.s, ruid.len, ruid.s); + + LM_DBG("added branch [%.*s] with ruid [%.*s]\n", + current_uri.len, current_uri.s, ruid.len, ruid.s); /* test if cancel was received meanwhile */ if (t->flags & T_CANCELED) goto canceled; @@ -167,7 +168,7 @@ int t_append_branches(void) { if (added_branches==0) { if(lowest_ret!=E_CFG) - LOG(L_ERR, "ERROR: t_append_branch: failure to add branches (%d)\n", lowest_ret); + LM_ERR("failure to add branches (%d)\n", lowest_ret); ser_error=lowest_ret; ret = lowest_ret; goto done; @@ -211,7 +212,7 @@ int t_append_branches(void) { goto done; canceled: - DBG("t_append_branches: cannot append branches to a canceled transaction\n"); + LM_DBG("cannot append branches to a canceled transaction\n"); /* reset processed branches */ clear_branches(); /* restore backup flags from initial env */ @@ -228,7 +229,7 @@ int t_append_branches(void) { /* restore original environment and free the fake msg */ faked_env( t, 0, 0); free_faked_req(&faked_req,t); - + if (likely(replies_locked)) { replies_locked = 0; UNLOCK_REPLIES(t); diff --git a/src/modules/tm/t_cancel.c b/src/modules/tm/t_cancel.c index b5e83f40316..c0635844efd 100644 --- a/src/modules/tm/t_cancel.c +++ b/src/modules/tm/t_cancel.c @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ @@ -70,7 +70,7 @@ void cancel_reason_text(struct cancel_info* cancel_data) /** Prepare to cancel a transaction. * Determine which branches should be canceled and prepare them (internally * mark them as "cancel in progress", see prepare_cancel_branch()). - * Can be called without REPLY_LOCK, since prepare_cancel_branch() is atomic + * Can be called without REPLY_LOCK, since prepare_cancel_branch() is atomic * now * -- andrei * WARNING: - has side effects, see prepare_cancel_branch() * - one _must_ call cancel_uacs(cancel_bm) if *cancel_bm!=0 or @@ -88,11 +88,11 @@ void prepare_to_cancel(struct cell *t, branch_bm_t *cancel_bm, int i; int branches_no; branch_bm_t mask; - + *cancel_bm=0; branches_no=t->nr_of_outgoings; mask=~skip_branches; - membar_depends(); + membar_depends(); for( i=0 ; inr_of_outgoings ; i++ ) + for( i=0 ; inr_of_outgoings ; i++ ) if (cancel_data->cancel_bitmap & (1<hash_index, trans->label); - + LM_DBG("Canceling T@%p [%u:%u]\n", trans, trans->hash_index, trans->label); + init_cancel_info(&cancel_data); prepare_to_cancel(trans, &cancel_data.cancel_bitmap, 0); /* tell tm to cancel the call */ i=cancel_uacs(trans, &cancel_data, how); - + if (how & F_CANCEL_UNREF) #ifndef TM_DEL_UNREF - /* in case of 'too many' _buggy_ invocations, the ref count (a uint) might + /* in case of 'too many' _buggy_ invocations, the ref count (a uint) might * actually wrap around, possibly leaving the T leaking. */ #warning "use of F_CANCEL_UNREF flag is unsafe without defining TM_DEL_UNREF" #endif @@ -181,24 +181,24 @@ int cancel_all_uacs(struct cell *trans, int how) * params: t - transaction * branch - branch number to be canceled * reason - cancel reason structure - * flags - howto cancel: - * F_CANCEL_B_KILL - will completely stop the + * flags - howto cancel: + * F_CANCEL_B_KILL - will completely stop the * branch (stops the timers), use with care * F_CANCEL_B_FAKE_REPLY - will send a fake 487 * to all branches that haven't received any response * (>=100). It assumes the REPLY_LOCK is not held * (if it is => deadlock) - * F_CANCEL_B_FORCE_C - will send a cancel (and create the - * corresp. local cancel rb) even if no reply was + * F_CANCEL_B_FORCE_C - will send a cancel (and create the + * corresp. local cancel rb) even if no reply was * received; F_CANCEL_B_FAKE_REPLY will be ignored. - * F_CANCEL_B_FORCE_RETR - don't stop retransmission if no + * F_CANCEL_B_FORCE_RETR - don't stop retransmission if no * reply was received on the branch; incompatible * with F_CANCEL_B_FAKE_REPLY, F_CANCEL_B_FORCE_C and * F_CANCEL_B_KILL (all of them take precedence) a * default: stop only the retransmissions for the branch * and leave it to timeout if it doesn't receive any * response to the CANCEL - * returns: 0 - branch inactive after running cancel_branch() + * returns: 0 - branch inactive after running cancel_branch() * 1 - branch still active (fr_timer) * -1 - error * WARNING: @@ -208,7 +208,7 @@ int cancel_all_uacs(struct cell *trans, int how) * explicitly "put_on_wait" it might live forever) * - F_CANCEL_B_FAKE_REPLY must be used only if the REPLY_LOCK is not * held - * - checking for buffer==0 under REPLY_LOCK is no enough, an + * - checking for buffer==0 under REPLY_LOCK is no enough, an * atomic_cmpxhcg or atomic_get_and_set _must_ be used. */ int cancel_branch( struct cell *t, int branch, @@ -232,8 +232,7 @@ int cancel_branch( struct cell *t, int branch, # ifdef EXTRA_DEBUG if (crb->buffer!=BUSY_BUFFER) { - LOG(L_CRIT, "ERROR: attempt to rewrite cancel buffer: %p\n", - crb->buffer); + LM_CRIT("attempt to rewrite cancel buffer: %p\n", crb->buffer); abort(); } # endif @@ -243,8 +242,7 @@ int cancel_branch( struct cell *t, int branch, ret=0; if ((t->uac[branch].last_received < 100) && !(flags & F_CANCEL_B_FORCE_C)) { - DBG("DEBUG: cancel_branch: no response ever received: " - "giving up on cancel\n"); + LM_DBG("no response ever received: giving up on cancel\n"); /* remove BUSY_BUFFER -- mark cancel buffer as not used */ pcbuf=&crb->buffer; /* workaround for type punning warnings */ atomic_set_long(pcbuf, 0); @@ -255,7 +253,7 @@ int cancel_branch( struct cell *t, int branch, && !(irb->flags&F_RB_RELAYREPLY) && !(t->flags&T_ADMIN_REPLY)) { LOCK_REPLIES(t); - if (relay_reply(t, FAKED_REPLY, branch, 487, &tmp_cd, 1) == + if (relay_reply(t, FAKED_REPLY, branch, 487, &tmp_cd, 1) == RPS_ERROR){ return -1; } @@ -276,7 +274,7 @@ int cancel_branch( struct cell *t, int branch, if (flags & F_CANCEL_B_FAKE_REPLY){ stop_rb_timers( irb ); /* stop even the fr timer */ LOCK_REPLIES(t); - if (relay_reply(t, FAKED_REPLY, branch, 487, &tmp_cd, 1)== + if (relay_reply(t, FAKED_REPLY, branch, 487, &tmp_cd, 1)== RPS_ERROR){ return -1; } @@ -307,7 +305,7 @@ int cancel_branch( struct cell *t, int branch, ); } if (!cancel) { - LOG(L_ERR, "ERROR: attempt to build a CANCEL failed\n"); + LM_ERR("attempt to build a CANCEL failed\n"); /* remove BUSY_BUFFER -- mark cancel buffer as not used */ pcbuf=&crb->buffer; /* workaround for type punning warnings */ atomic_set_long(pcbuf, 0); @@ -323,18 +321,18 @@ int cancel_branch( struct cell *t, int branch, * by an atomic_set((void*)&crb->buffer, cancel) */ if (unlikely(atomic_cmpxchg_long((void*)&crb->buffer, (long)BUSY_BUFFER, (long)cancel)!= (long)BUSY_BUFFER)){ - BUG("tm: cancel_branch: local_cancel buffer=%p != BUSY_BUFFER" + LM_BUG("local_cancel buffer=%p != BUSY_BUFFER" " (trying to continue)\n", crb->buffer); shm_free(cancel); return -1; } - membar_write_atomic_op(); /* cancel retr. can be called from - reply_received w/o the reply lock held => - they check for buffer_len to + membar_write_atomic_op(); /* cancel retr. can be called from + reply_received w/o the reply lock held => + they check for buffer_len to see if a valid reply exists */ crb->buffer_len = len; - DBG("DEBUG: cancel_branch: sending cancel...\n"); + LM_DBG("sending cancel...\n"); if (SEND_BUFFER( crb )>=0){ if (unlikely (has_tran_tmcbs(t, TMCB_REQUEST_OUT))) run_trans_callbacks_with_buf(TMCB_REQUEST_OUT, crb, t->uas.request, 0, TMCB_LOCAL_F); @@ -343,8 +341,7 @@ int cancel_branch( struct cell *t, int branch, } /*sets and starts the FINAL RESPONSE timer */ if (start_retr( crb )!=0) - LOG(L_CRIT, "BUG: cancel_branch: failed to start retransmission" - " for %p\n", crb); + LM_CRIT("failed to start retransmission for %p\n", crb); return ret; } @@ -376,7 +373,7 @@ void rpc_cancel(rpc_t* rpc, void* c) } if( t_lookup_callid(&trans, callid_s, cseq_s) < 0 ) { - DBG("Lookup failed\n"); + LM_DBG("Lookup failed\n"); rpc->fault(c, 400, "Transaction not found"); return; } @@ -384,9 +381,9 @@ void rpc_cancel(rpc_t* rpc, void* c) prepare_to_cancel(trans, &cancel_data.cancel_bitmap, 0); /* tell tm to cancel the call */ DBG("Now calling cancel_uacs\n"); - i=cancel_uacs(trans, &cancel_data, 0); /* don't fake 487s, + i=cancel_uacs(trans, &cancel_data, 0); /* don't fake 487s, just wait for timeout */ - + /* t_lookup_callid REF`d the transaction for us, we must UNREF here! */ UNREF(trans); j=0; @@ -403,7 +400,7 @@ void rpc_cancel(rpc_t* rpc, void* c) int cancel_b_flags_get(unsigned int* f, int m) { int ret; - + ret=0; switch(m){ case 1: @@ -430,12 +427,11 @@ int cancel_b_flags_fixup(void* handle, str* gname, str* name, void** val) { unsigned int m,f; int ret; - + m=(unsigned int)(long)(*val); ret=cancel_b_flags_get(&f, m); if (ret<0) - ERR("cancel_b_flags_fixup: invalid value for %.*s; %d\n", - name->len, name->s, m); + LM_ERR("invalid value for %.*s; %d\n", name->len, name->s, m); *val=(void*)(long)f; return ret; } @@ -548,5 +544,3 @@ unsigned int t_uac_cancel( str *headers, str *body, error3: return ret; } - - diff --git a/src/modules/tm/t_fwd.c b/src/modules/tm/t_fwd.c index 488b2980ec7..5cc649ebdde 100644 --- a/src/modules/tm/t_fwd.c +++ b/src/modules/tm/t_fwd.c @@ -1105,7 +1105,7 @@ int e2e_cancel_branch( struct sip_msg *cancel_msg, struct cell *t_cancel, #endif /* CANCEL_REASON_SUPPORT */ ); if (unlikely(!shbuf)) { - LOG(L_ERR, "e2e_cancel_branch: printing e2e cancel failed\n"); + LM_ERR("printing e2e cancel failed\n"); ret=ser_error=E_OUT_OF_MEM; goto error; } diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index bb44d136c4f..61f590814da 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1583,7 +1583,7 @@ static int store_reply( struct cell *trans, int branch, struct sip_msg *rpl) trans->uac[branch].reply = sip_msg_cloner( rpl, 0 ); if (! trans->uac[branch].reply ) { - LOG(L_ERR, "ERROR: store_reply: can't alloc' clone memory\n"); + LM_ERR("can't alloc' clone memory\n"); return 0; } diff --git a/src/modules/tm/test.c b/src/modules/tm/test.c index 047ac40958c..e1b2550c6e2 100644 --- a/src/modules/tm/test.c +++ b/src/modules/tm/test.c @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2001-2003 FhG Fokus * * This file is part of Kamailio, a free SIP server. @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -44,22 +44,21 @@ int _test_insert_to_reply( struct sip_msg *msg, char *str ) len=strlen( str ); buf=pkg_malloc( len ); if (!buf) { - LOG(L_ERR, "_test_insert_to_reply: no mem\n"); + LM_ERR("no mem\n"); return 0; } memcpy( buf, str, len ); anchor = anchor_lump(msg, msg->headers->name.s - msg->buf, 0 , 0); if (anchor == NULL) { - LOG(L_ERR, "_test_insert_to_reply: anchor_lump failed\n"); + LM_ERR("anchor_lump failed\n"); return 0; } if (insert_new_lump_before(anchor,buf, len, 0)==0) { - LOG(L_ERR, "_test_insert_to_reply: insert_new_lump failed\n"); + LM_ERR("insert_new_lump failed\n"); return 0; } return 1; } #endif -