sr-dev November 2012

sr-dev@lists.kamailio.org

28 participants
122 discussions

git:master: b/f: When the shortcut "x" is used, only add IE/EI once
by admin＠sip-router.org 08 Nov '12

08 Nov '12

Module: sip-router Branch: master Commit: ac97e3a86d8e4f4c7d0abdffd84bb2ec4ff31ad4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ac97e3a… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)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; } }

2 1

git:master: RTPProxy: Documentation improvements
by admin＠sip-router.org 08 Nov '12

08 Nov '12

Module: sip-router Branch: master Commit: 5b6f68ae0dc50c05902ace37f1081b19bda0320e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5b6f68a… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Tue Nov 6 16:32:50 2012 +0100 RTPProxy: Documentation improvements - added a note about compatibility with different implementations for the "x"-flag (namely RFC 4091 and RFC 6157) - made more clear, that "x" is only a shortcut for the "IE" and "EI" flags of RTPProxy --- modules/rtpproxy/doc/rtpproxy_admin.xml | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/modules/rtpproxy/doc/rtpproxy_admin.xml b/modules/rtpproxy/doc/rtpproxy_admin.xml index e3a403e..b7f719e 100644 --- a/modules/rtpproxy/doc/rtpproxy_admin.xml +++ b/modules/rtpproxy/doc/rtpproxy_admin.xml @@ -343,11 +343,17 @@ rtpproxy_offer(); the 'w' flag for clients behind NAT! See also above notes! </para></listitem> <listitem><para> - <emphasis>x</emphasis> - this flag will do automatic bridging between IPv4 on the + <emphasis>x</emphasis> - this flag a shortcut for using the "ie" or "ei"-flags of RTP-Proxy, + in order to do automatic bridging between IPv4 on the "internal network" and IPv6 on the "external network". The distinction is done by the given IP in the SDP, e.g. a IPv4 Address will always call "ie" to the RTPProxy (IPv4(i) to IPv6(e)) and an IPv6Address will always call "ei" to the RTPProxy (IPv6(e) to IPv4(i)). + </para><para> + Note: Please note, that this will only work properly with non-dual-stack user-agents or with + dual-stack clients according to RFC6157 (which suggest ICE for Dual-Stack implementations). + This short-cut will not work properly with RFC4091 (ANAT) compatible clients, which suggests + having different m-lines with different IP-protocols grouped together. </para></listitem> <listitem><para> <emphasis>f</emphasis> - instructs rtpproxy to ignore marks

3 7

git:master: msrp: fix compile warnings for 32b
by Daniel-Constantin Mierla 08 Nov '12

08 Nov '12

Module: sip-router Branch: master Commit: 22eb98280f82fc10202862097d954d099b605700 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=22eb982… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Nov 7 23:56:49 2012 +0100 msrp: fix compile warnings for 32b --- modules/msrp/msrp_parser.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/msrp/msrp_parser.c b/modules/msrp/msrp_parser.c index 3f7e336..eb275e1 100644 --- a/modules/msrp/msrp_parser.c +++ b/modules/msrp/msrp_parser.c @@ -487,7 +487,7 @@ int msrp_parse_uri(char *start, int len, msrp_uri_t *uri) if(uri->host.len<=0) { LM_ERR("bad host part in [%.*s] at [%ld]\n", - len, start, s - start); + len, start, (long)(s - start)); goto error; } if(uri->port.len <= 0) @@ -498,7 +498,7 @@ int msrp_parse_uri(char *start, int len, msrp_uri_t *uri) if(uri->port_no<1 || uri->port_no > ((1<<16)-1)) { LM_ERR("bad port part in [%.*s] at [%ld]\n", - len, start, s - start); + len, start, (long)(s - start)); goto error; } }

1 0

git:3.3: modules_k/siputils: Fix memory leak in uri_param() function
by Richard Fuchs 07 Nov '12

07 Nov '12

Module: sip-router Branch: 3.3 Commit: 858e4148f222e9f448d54c6bee45a53a8def7062 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=858e414… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Wed Nov 7 09:12:33 2012 -0500 modules_k/siputils: Fix memory leak in uri_param() function --- modules_k/siputils/checks.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/modules_k/siputils/checks.c b/modules_k/siputils/checks.c index 6bbb72f..9794c9d 100644 --- a/modules_k/siputils/checks.c +++ b/modules_k/siputils/checks.c @@ -168,7 +168,7 @@ int uri_param_2(struct sip_msg* _msg, char* _param, char* _value) str *param, *value, t; param_hooks_t hooks; - param_t* params; + param_t* params, *pit; param = (str*)_param; value = (str*)_value; @@ -185,25 +185,23 @@ int uri_param_2(struct sip_msg* _msg, char* _param, char* _value) return -1; } - while (params) { - if ((params->name.len == param->len) && - (strncmp(params->name.s, param->s, param->len) == 0)) { + for (pit = params; pit; pit = pit->next) { + if ((pit->name.len == param->len) && + (strncmp(pit->name.s, param->s, param->len) == 0)) { if (value) { - if ((value->len == params->body.len) && - strncmp(value->s, params->body.s, value->len) == 0) { + if ((value->len == pit->body.len) && + strncmp(value->s, pit->body.s, value->len) == 0) { goto ok; } else { goto nok; } } else { - if (params->body.len > 0) { + if (pit->body.len > 0) { goto nok; } else { goto ok; } } - } else { - params = params->next; } }

1 0

git:master: modules_k/siputils: Fix memory leak in uri_param() function
by Richard Fuchs 07 Nov '12

07 Nov '12

Module: sip-router Branch: master Commit: 5154c90b60d54ad6c993eacaadea29740c12e82b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5154c90… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Wed Nov 7 09:12:33 2012 -0500 modules_k/siputils: Fix memory leak in uri_param() function --- modules_k/siputils/checks.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/modules_k/siputils/checks.c b/modules_k/siputils/checks.c index 6bbb72f..9794c9d 100644 --- a/modules_k/siputils/checks.c +++ b/modules_k/siputils/checks.c @@ -168,7 +168,7 @@ int uri_param_2(struct sip_msg* _msg, char* _param, char* _value) str *param, *value, t; param_hooks_t hooks; - param_t* params; + param_t* params, *pit; param = (str*)_param; value = (str*)_value; @@ -185,25 +185,23 @@ int uri_param_2(struct sip_msg* _msg, char* _param, char* _value) return -1; } - while (params) { - if ((params->name.len == param->len) && - (strncmp(params->name.s, param->s, param->len) == 0)) { + for (pit = params; pit; pit = pit->next) { + if ((pit->name.len == param->len) && + (strncmp(pit->name.s, param->s, param->len) == 0)) { if (value) { - if ((value->len == params->body.len) && - strncmp(value->s, params->body.s, value->len) == 0) { + if ((value->len == pit->body.len) && + strncmp(value->s, pit->body.s, value->len) == 0) { goto ok; } else { goto nok; } } else { - if (params->body.len > 0) { + if (pit->body.len > 0) { goto nok; } else { goto ok; } } - } else { - params = params->next; } }

1 0

git:3.3: allow freeing of NULL pointer to behave like standard free() function
by Klaus Darilion 07 Nov '12

07 Nov '12

Module: sip-router Branch: 3.3 Commit: 020acff35f8e9dfa62aba8678a781a0f7bbb110b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=020acff… Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: Wed Nov 7 13:55:55 2012 +0000 allow freeing of NULL pointer to behave like standard free() function The memory functions provided to openssl needs to behave like standard memory functions, i.e. free(). Therefore, ser_free must accept NULL pointers, see: http://openssl.6102.n7.nabble.com/Custom-free-routine-is-invoked-with-NULL-… As shm_free() aborts on null pointers, we have to check for null pointer here in the wrapper function. (cherry picked from commit 7c37f8d4dc311c64c12e0b03b5e312892f9d886c) --- modules/tls/tls_init.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/modules/tls/tls_init.c b/modules/tls/tls_init.c index e409b5e..b629afa 100644 --- a/modules/tls/tls_init.c +++ b/modules/tls/tls_init.c @@ -295,7 +295,15 @@ static void* ser_realloc(void *ptr, size_t size) static void ser_free(void *ptr) { - shm_free(ptr); + /* The memory functions provided to openssl needs to behave like standard + * memory functions, i.e. free(). Therefore, ser_free must accept NULL + * pointers, see: http://openssl.6102.n7.nabble.com/Custom-free-routine-is-invoked-with-NULL-… + * As shm_free() aborts on null pointers, we have to check for null pointer + * here in the wrapper function. + */ + if (ptr) { + shm_free(ptr); + } }

1 0

git:master: allow freeing of NULL pointer to behave like standard free() function
by Klaus Darilion 07 Nov '12

07 Nov '12

Module: sip-router Branch: master Commit: 7c37f8d4dc311c64c12e0b03b5e312892f9d886c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7c37f8d… Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: Wed Nov 7 13:55:55 2012 +0000 allow freeing of NULL pointer to behave like standard free() function The memory functions provided to openssl needs to behave like standard memory functions, i.e. free(). Therefore, ser_free must accept NULL pointers, see: http://openssl.6102.n7.nabble.com/Custom-free-routine-is-invoked-with-NULL-… As shm_free() aborts on null pointers, we have to check for null pointer here in the wrapper function. --- modules/tls/tls_init.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/modules/tls/tls_init.c b/modules/tls/tls_init.c index e409b5e..b629afa 100644 --- a/modules/tls/tls_init.c +++ b/modules/tls/tls_init.c @@ -295,7 +295,15 @@ static void* ser_realloc(void *ptr, size_t size) static void ser_free(void *ptr) { - shm_free(ptr); + /* The memory functions provided to openssl needs to behave like standard + * memory functions, i.e. free(). Therefore, ser_free must accept NULL + * pointers, see: http://openssl.6102.n7.nabble.com/Custom-free-routine-is-invoked-with-NULL-… + * As shm_free() aborts on null pointers, we have to check for null pointer + * here in the wrapper function. + */ + if (ptr) { + shm_free(ptr); + } }

1 0

git:master: usrloc - Documentation updates (mostly typos and smaller fixes)
by Olle E. Johansson 06 Nov '12

06 Nov '12

Module: sip-router Branch: master Commit: 5e77d14b9f0304942517e031406a147a668adec3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5e77d14… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Wed Nov 7 00:13:20 2012 +0100 usrloc - Documentation updates (mostly typos and smaller fixes) Based on feedback during SIP Masterclass - Jared and Anthony. Thanks! --- modules_k/usrloc/README | 89 +++++++++++++++++---------------- modules_k/usrloc/doc/usrloc_admin.xml | 73 ++++++++++++++------------- 2 files changed, 82 insertions(+), 80 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=5e7…

1 0

git:master: (core|modules/tm): corrected ambiguous error messages.
by Peter Dunkley 06 Nov '12

06 Nov '12

Module: sip-router Branch: master Commit: 897dfc4c0a7bad253cfe672e58d665e9b3deb34e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=897dfc4… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Nov 6 23:28:55 2012 +0100 (core|modules/tm): corrected ambiguous error messages. - As per Henning's suggestions. --- modules/tm/t_fwd.c | 2 +- msg_translator.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index 7f4ad54..1423eea 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -428,7 +428,7 @@ static int prepare_new_uac( struct cell *t, struct sip_msg *i_req, /* ... and build it now */ shbuf=build_req_buf_from_sip_req( i_req, &len, dst, BUILD_IN_SHM); if (!shbuf) { - LM_ERR("building request\n"); + LM_ERR("could not build request\n"); ret=E_OUT_OF_MEM; goto error01; } diff --git a/msg_translator.c b/msg_translator.c index 2579a41..5783b7e 100644 --- a/msg_translator.c +++ b/msg_translator.c @@ -1722,7 +1722,7 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, if (unlikely(via_anchor==0)) goto error00; line_buf = create_via_hf( &via_len, msg, send_info, &branch); if (unlikely(!line_buf)){ - LM_WARN("creating Via header\n"); + LM_ERR("could not create Via header\n"); goto error00; } after_local_via:

1 0

git:3.3: New Option: "x" for automatic bridging between IPv4 and IPv6.
by admin＠sip-router.org 06 Nov '12

06 Nov '12

Module: sip-router Branch: 3.3 Commit: cd1c367218cdcd5f0867af2234f6080e8e6622a6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd1c367… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Mon Sep 17 17:25:38 2012 +0200 New Option: "x" for automatic bridging between IPv4 and IPv6. Based on the following assumption: "i" is the IPv4 interface and "e" is the IPv6 interface on the RTPProxy (tested with both RTPProxy and Sipwise's ngcp-mediaproxy-ng). Mechanism is as follows: - IP in SDP is IPv4: Do bridging "ie" - IP in SDP is IPv6: Do bridging "ei" Not a big deal, but makes the configuration much more easier. --- modules/rtpproxy/doc/rtpproxy.xml | 8 ++++++++ modules/rtpproxy/doc/rtpproxy_admin.xml | 7 +++++++ modules/rtpproxy/rtpproxy.c | 22 +++++++++++++++++++++- 3 files changed, 36 insertions(+), 1 deletions(-) diff --git a/modules/rtpproxy/doc/rtpproxy.xml b/modules/rtpproxy/doc/rtpproxy.xml index d5a15ee..741a4d9 100644 --- a/modules/rtpproxy/doc/rtpproxy.xml +++ b/modules/rtpproxy/doc/rtpproxy.xml @@ -57,6 +57,14 @@ <email>osas(a)voipembedded.com</email> </address> </editor> + <editor> + <firstname>Carsten</firstname> + <surname>Bock</surname> + <affiliation><orgname>ng-voice GmbH</orgname></affiliation> + <address> + <email>carsten(a)ng-voice.com</email> + </address> + </editor> </authorgroup> <copyright> <year>2003-2008</year> diff --git a/modules/rtpproxy/doc/rtpproxy_admin.xml b/modules/rtpproxy/doc/rtpproxy_admin.xml index 6b9577a..64843eb 100644 --- a/modules/rtpproxy/doc/rtpproxy_admin.xml +++ b/modules/rtpproxy/doc/rtpproxy_admin.xml @@ -343,6 +343,13 @@ rtpproxy_offer(); the 'w' flag for clients behind NAT! See also above notes! </para></listitem> <listitem><para> + <emphasis>x</emphasis> - this flag will do automatic bridging between IPv4 on the + "internal network" and IPv6 on the "external network". The distinction is done by + the given IP in the SDP, e.g. a IPv4 Address will always call "ie" to the RTPProxy + (IPv4(i) to IPv6(e)) and an IPv6Address will always call "ei" to the RTPProxy (IPv6(e) + to IPv4(i)). + </para></listitem> + <listitem><para> <emphasis>f</emphasis> - instructs rtpproxy to ignore marks inserted by another rtpproxy in transit to indicate that the session is already goes through another proxy. Allows creating diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c index b50b2d1..e18655f 100644 --- a/modules/rtpproxy/rtpproxy.c +++ b/modules/rtpproxy/rtpproxy.c @@ -1939,6 +1939,7 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer, int forc {NULL, 0}, /* Timeout-Socket */ }; int iovec_param_count; + int autobridge_ipv4v6; char *c1p, *c2p, *bodylimit, *o1p; char itoabuf_buf[20]; @@ -1958,7 +1959,7 @@ 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); } - flookup = force = real = orgip = commip = via = 0; + flookup = force = real = orgip = commip = via = autobridge_ipv4v6 = 0; for (cp = str1; cp != NULL && *cp != '\0'; cp++) { switch (*cp) { case '1': @@ -2022,6 +2023,11 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer, int forc orgip = 1; break; + case 'x': + case 'X': + autobridge_ipv4v6 = 1; + break; + case 'w': case 'W': if (append_opts(&opts, 'S') == -1) { @@ -2199,6 +2205,12 @@ 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)) { + LM_ERR("out of pkg memory\n"); + FORCE_RTP_PROXY_RET (-1); + } + } if (append_opts(&opts, '6') == -1) { LM_ERR("out of pkg memory\n"); FORCE_RTP_PROXY_RET (-1); @@ -2206,7 +2218,15 @@ 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; + } else { + if (autobridge_ipv4v6 != 0) { + if ((append_opts(&opts, 'I') == -1) && (append_opts(&opts, 'E') == -1)) { + LM_ERR("out of pkg memory\n"); + FORCE_RTP_PROXY_RET (-1); + } + } } + STR2IOVEC(newip, v[9]); STR2IOVEC(oldport, v[11]); #ifdef EXTRA_DEBUG

6 11

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2012