Module: kamailio Branch: master Commit: 5b223a2e8a92f351b8eab756f5256fda7645ff21 URL: https://github.com/kamailio/kamailio/commit/5b223a2e8a92f351b8eab756f5256fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T15:03:44+02:00 tm: update uas rb activ_type when overwriting realyed_code - otherwise could end up skipping the execution for TMCB_RESPONSE_OUT tm callback, affecting acc, ... --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/5b223a2e8a92f351b8eab756f5256fd… Patch: https://github.com/kamailio/kamailio/commit/5b223a2e8a92f351b8eab756f5256fd… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 271932c90c..14f244ef7d 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1795,6 +1795,7 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, buf=0; relayed_msg=0; relayed_code=0; + totag_retr=0; /* remember, what was sent upstream to know whether we are @@ -1803,8 +1804,8 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, /* *** store and relay message as needed *** */ reply_status = t_should_relay_response(t, msg_status, branch, &save_clone, &relay, cancel_data, p_msg ); - LM_DBG("branch=%d, save=%d, relay=%d icode=%d\n", - branch, save_clone, relay, t->uac[branch].icode); + LM_DBG("branch=%d, save=%d, relay=%d icode=%d msg status=%u\n", + branch, save_clone, relay, t->uac[branch].icode, msg_status); /* store the message if needed */ if (save_clone) /* save for later use, typically branch picking */ @@ -1833,8 +1834,9 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, if(t->flags & T_CANCELED) { /* transaction canceled - send 487 */ relayed_code = 487; + uas_rb->activ_type = 487; } else { - relayed_code = branch==relay + relayed_code = (branch==relay) ? msg_status : t->uac[relay].last_received; } /* use to_tag from the original request, or if not present, @@ -1887,6 +1889,7 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, buf=build_res_buf_from_sip_req(500, &reason, to_tag, t->uas.request, &res_len, &bm); relayed_code=500; + uas_rb->activ_type = 500; }else if (cfg_get(tm, tm_cfg, tm_aggregate_auth) && (relayed_code==401 || relayed_code==407) && (auth_reply_count(t, p_msg)>1)){ @@ -2003,6 +2006,10 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, if(relayed_code==uas_rb->activ_type) { run_trans_callbacks_with_buf( TMCB_RESPONSE_OUT, uas_rb, t->uas.request, relayed_msg, TMCB_NONE_F); + } else { + LM_DBG("skip tm callback %d - relay code %d active %d\n", + TMCB_RESPONSE_OUT, relayed_code, + uas_rb->activ_type); } UNLOCK_REPLIES( t ); }