sr-dev November 2012

sr-dev@lists.kamailio.org

28 participants
122 discussions

git:3.3: Minor bug-fix: Need to update length.
by admin＠sip-router.org 01 Nov '12

01 Nov '12

Module: sip-router Branch: 3.3 Commit: ea5608548508f72f765e6f9590b1e1e2a23fe665 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ea56085… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Tue Sep 18 20:42:55 2012 +0200 Minor bug-fix: Need to update length. --- modules/rtpproxy/rtpproxy.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c index e18655f..3ba0455 100644 --- a/modules/rtpproxy/rtpproxy.c +++ b/modules/rtpproxy/rtpproxy.c @@ -2206,7 +2206,7 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer, int forc /* XXX must compare address families in all addresses */ if (pf == AF_INET6) { if (autobridge_ipv4v6 != 0) { - if ((append_opts(&opts, 'E') == -1) && (append_opts(&opts, 'I') == -1)) { + if ((append_opts(&opts, 'E') == -1) || (append_opts(&opts, 'I') == -1)) { LM_ERR("out of pkg memory\n"); FORCE_RTP_PROXY_RET (-1); } @@ -2220,10 +2220,13 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer, int forc v[1].iov_len = opts.oidx; } else { if (autobridge_ipv4v6 != 0) { - if ((append_opts(&opts, 'I') == -1) && (append_opts(&opts, 'E') == -1)) { + if ((append_opts(&opts, 'I') == -1) || (append_opts(&opts, 'E') == -1)) { LM_ERR("out of pkg memory\n"); FORCE_RTP_PROXY_RET (-1); } + /* 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; } }

1 0

git:master: core: Fixed typo that broke the build
by Peter Dunkley 01 Nov '12

01 Nov '12

Module: sip-router Branch: master Commit: 53135e42d0048670a25908532bdb26706db48b7a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=53135e4… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Nov 1 15:54:51 2012 +0000 core: Fixed typo that broke the build --- msg_translator.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/msg_translator.c b/msg_translator.c index 6985418..2579a41 100644 --- a/msg_translator.c +++ b/msg_translator.c @@ -2495,7 +2495,7 @@ char* via_builder( unsigned int *len, } if (con == NULL) { - LM_WARN("TCP/TLS connection (id: %d) for WebSocket could not be found\n" + LM_WARN("TCP/TLS connection (id: %d) for WebSocket could not be found\n", send_info->id); return 0; }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2012