[sr-dev] git:master: b/f: When the shortcut "x" is used, only add IE/EI once

[Daniel-Constantin Mierla]

Hello,

please indicate in the first part of the first line of the description 
what is the component affected by the commit (like the majority of the 
commits). It helps having proper changelog over the time - see 
description at:

http://www.kamailio.org/wiki/devel/git-commit-guidelines#commit_message

Cheers,
Daniel


On 11/8/12 5:58 PM, admin at sip-router.org wrote:
> Module: sip-router
> Branch: master
> Commit: ac97e3a86d8e4f4c7d0abdffd84bb2ec4ff31ad4
> URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ac97e3a86d8e4f4c7d0abdffd84bb2ec4ff31ad4
>
> Author: Carsten Bock <carsten at ng-voice.com>
> Committer: Carsten Bock <carsten at ng-voice.com>
> Date:   Thu Nov  8 17:56:41 2012 +0100
>
> b/f: When the shortcut "x" is used, only add IE/EI once
>
> ---
>
>   modules/rtpproxy/rtpproxy.c |    4 ++++
>   1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c
> index cab92ad..b704b98 100644
> --- a/modules/rtpproxy/rtpproxy.c
> +++ b/modules/rtpproxy/rtpproxy.c
> @@ -2320,6 +2320,8 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer, int forc
>   						LM_ERR("out of pkg memory\n");
>   						FORCE_RTP_PROXY_RET (-1);
>   					}
> +					/* Only execute once */
> +					autobridge_ipv4v6 = 0;
>   				}
>   				if (append_opts(&opts, '6') == -1) {
>   					LM_ERR("out of pkg memory\n");
> @@ -2337,6 +2339,8 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer, int forc
>   					/* We need to update the pointers and the length here, it has changed. */
>   					v[1].iov_base = opts.s.s;
>   					v[1].iov_len = opts.oidx;
> +					/* Only execute once */
> +					autobridge_ipv4v6 = 0;
>   				}
>   			}
>   
>
>
> _______________________________________________
> 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://www.asipto.com
http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda
Kamailio Advanced Training, Berlin, Nov 5-8, 2012 - http://asipto.com/u/kat
Kamailio Advanced Training, Miami, USA, Nov 12-14, 2012 - http://asipto.com/u/katu