Module: sip-router Branch: master Commit: fb4ecbf986f4af366e5be9cbad26ceba924c77fd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fb4ecbf… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: Wed Aug 3 23:03:54 2011 +0200 tm: don't set dst_uri to next hop for branch_route - added flag to skip setting dst_uri to next hop for branch_route if the dst_uri was not set before - there is already a select and a pseudo-variable to access next hop value, in case it is needed in branch route - reported by Alex Hermann --- modules/tm/t_fwd.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index 6385812..30558ab 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -151,6 +151,8 @@ unsigned int get_on_branch(void) /* prepare_new_uac flags */ #define UAC_DNS_FAILOVER_F 1 /**< new branch due to dns failover */ +#define UAC_SKIP_BR_DST_F 2 /**< don't set next hop as dst_uri for + branch_route */ /** prepares a new branch "buffer". @@ -176,7 +178,7 @@ unsigned int get_on_branch(void) * @param fsocket - forced send socket for forwarding. * @param send_flags - special flags for sending (see SND_F_* / snd_flags_t). * @param fproto - forced proto for forwarding. Used only if next_hop!=0. - * @param flags - 0 or UAC_DNS_FAILOVER_F for now. + * @param flags - 0, UAC_DNS_FAILOVER_F or UAC_SKIP_BR_DST_F for now. * * @return 0 on success, < 0 (ser_errror E***) on failure. */ @@ -302,10 +304,12 @@ static int prepare_new_uac( struct cell *t, struct sip_msg *i_req, i_req->dst_uri.s=0; i_req->dst_uri.len=0; if (likely(next_hop)){ - /* set dst uri to next_hop for the on_branch route */ - if (unlikely(set_dst_uri(i_req, next_hop)<0)){ - ret=E_OUT_OF_MEM; - goto error03; + if(unlikely((flags & UAC_SKIP_BR_DST_F)==0)){ + /* set dst uri to next_hop for the on_branch route */ + if (unlikely(set_dst_uri(i_req, next_hop)<0)){ + ret=E_OUT_OF_MEM; + goto error03; + } } } @@ -1475,7 +1479,8 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg , try_new=1; branch_ret=add_uac( t, p_msg, GET_RURI(p_msg), GET_NEXT_HOP(p_msg), &p_msg->path_vec, proxy, p_msg->force_send_socket, - p_msg->fwd_send_flags, proto, 0); + p_msg->fwd_send_flags, proto, + (p_msg->dst_uri.len)?0:UAC_SKIP_BR_DST_F); if (branch_ret>=0) added_branches |= 1<<branch_ret; else @@ -1491,7 +1496,7 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg , branch_ret=add_uac( t, p_msg, &current_uri, (dst_uri.len) ? (&dst_uri) : &current_uri, &path, proxy, si, p_msg->fwd_send_flags, - proto, 0); + proto, (dst_uri.len)?0:UAC_SKIP_BR_DST_F); /* pick some of the errors in case things go wrong; note that picking lowest error is just as good as any other algorithm which picks any other negative