[sr-dev] git:master: tm: use internal flags field to mark suspended replies with FL_RPL_SUSPENDED

Module: sip-router Branch: master Commit: a067a3d33ad67c260a3bc377cd4203d41880ca6b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a067a3d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 24 07:44:03 2013 +0200 tm: use internal flags field to mark suspended replies with FL_RPL_SUSPENDED - it was set on cfg flags, resulting in messing up with what was used in config file - reported by Juha Heinanen --- modules/tm/t_reply.c | 2 +- modules/tm/t_suspend.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 8703750..cac9ab4 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -2520,7 +2520,7 @@ int reply_received( struct sip_msg *p_msg ) } #endif - if (unlikely(p_msg->flags&FL_RPL_SUSPENDED)) { + if (unlikely(p_msg->msg_flags&FL_RPL_SUSPENDED)) { goto skip_send_reply; /* suspend the reply (async), no error */ } diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index 9509afc..f2cacbc 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -107,7 +107,7 @@ int t_suspend(struct sip_msg *msg, } }else{ LOG(L_DBG,"DEBUG: t_suspend_reply: This is a suspend on reply - setting msg flag to SUSPEND\n"); - msg->flags |= FL_RPL_SUSPENDED; + msg->msg_flags |= FL_RPL_SUSPENDED; /* this is a reply suspend find which branch */ if (t_check( msg , &branch )==-1){ @@ -280,8 +280,8 @@ int t_continue(unsigned int hash_index, unsigned int label, /* this is a continue from a reply suspend */ LOG(L_DBG,"DEBUG: t_continue_reply: Disabling suspend branch"); - t->uac[branch].reply->flags &= ~FL_RPL_SUSPENDED; - if (t->uas.request) t->uas.request->flags&= ~FL_RPL_SUSPENDED; + t->uac[branch].reply->msg_flags &= ~FL_RPL_SUSPENDED; + if (t->uas.request) t->uas.request->msg_flags&= ~FL_RPL_SUSPENDED; LOG(L_DBG,"DEBUG: t_continue_reply: Setting up faked environment"); if (!fake_resp(&faked_resp, t->uac[branch].reply, 0 /* extra flags */, 0)) { @@ -482,8 +482,8 @@ int t_cancel_suspend(unsigned int hash_index, unsigned int label) LOG(L_DBG,"DEBUG: t_cancel_suspend_reply: This is a cancel suspend for a response\n"); - t->uac[branch].reply->flags &= ~FL_RPL_SUSPENDED; - if (t->uas.request) t->uas.request->flags&= ~FL_RPL_SUSPENDED; + t->uac[branch].reply->msg_flags &= ~FL_RPL_SUSPENDED; + if (t->uas.request) t->uas.request->msg_flags&= ~FL_RPL_SUSPENDED; } return 0;