[sr-dev] git:master:27bed654: tm: check all the outgoing branches when appending a new branch

Daniel-Constantin Mierla miconda at gmail.com
Fri Sep 4 15:18:49 CEST 2015


Hello,

you re-introduced the history at the top of the file, which was removed
from tm module and going to be removed from everywhere in the code, as
most of it is irrelevant. The changes are better tracked via git now,
with the commit message and git diff/blame being very handy.

Cheers,
Daniel

On 04/09/15 15:13, Federico Cabiddu wrote:
> Module: kamailio
> Branch: master
> Commit: 27bed654dcc4e9dd543a7f2f92e2174478bf7f26
> URL: https://github.com/kamailio/kamailio/commit/27bed654dcc4e9dd543a7f2f92e2174478bf7f26
>
> Author: Federico Cabiddu <federico.cabiddu at gmail.com>
> Committer: Federico Cabiddu <federico.cabiddu at gmail.com>
> Date: 2015-09-04T15:12:29+02:00
>
> tm: check all the outgoing branches when appending a new branch
>
> ---
>
> Modified: modules/tm/t_append_branches.c
>
> ---
>
> Diff:  https://github.com/kamailio/kamailio/commit/27bed654dcc4e9dd543a7f2f92e2174478bf7f26.diff
> Patch: https://github.com/kamailio/kamailio/commit/27bed654dcc4e9dd543a7f2f92e2174478bf7f26.patch
>
> ---
>
> diff --git a/modules/tm/t_append_branches.c b/modules/tm/t_append_branches.c
> index 8060021..f16c672 100644
> --- a/modules/tm/t_append_branches.c
> +++ b/modules/tm/t_append_branches.c
> @@ -23,6 +23,9 @@
>   * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
>   * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>   *
> + * History:
> + * -------
> + *  2014-09-09  first release of t_append_branches
>   *
>   */
>  
> @@ -106,8 +109,6 @@ int t_append_branches(void) {
>  		set_branch_route(t->on_branch_delayed);
>  	}
>  
> -	outgoings = t->nr_of_outgoings;
> -
>  	/* not really sure that the following is needed */
>  
>  	set_branch_iterator(nr_branches-1);
> @@ -116,7 +117,7 @@ int t_append_branches(void) {
>  										&bflags, &si, &ruid, &instance, &location_ua))) {
>  		LM_DBG("Current uri %.*s\n",current_uri.len, current_uri.s);
>  
> -		for (i=0; i<=nr_branches; i++) {
> +		for (i=0; i<outgoings; i++) {
>  			if (t->uac[i].ruid.len == ruid.len
>  					&& !memcmp(t->uac[i].ruid.s, ruid.s, ruid.len)) {
>  				LM_DBG("branch already added [%.*s]\n", ruid.len, ruid.s);
> @@ -133,6 +134,8 @@ int t_append_branches(void) {
>  					&path, 0, si, orig_msg->fwd_send_flags,
>  					orig_msg->rcv.proto, (dst_uri.len)?-1: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);
>  
>  		/* test if cancel was received meanwhile */
>  		if (t->flags & T_CANCELED) goto canceled;
>
>
> _______________________________________________
> sr-dev mailing list
> sr-dev at lists.sip-router.org
> http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

-- 
Daniel-Constantin Mierla
http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda
Book: SIP Routing With Kamailio - http://www.asipto.com




More information about the sr-dev mailing list