sr-dev March 2013

sr-dev@lists.kamailio.org

36 participants
429 discussions

git:master: modules/outbound: updated to reflect STUN being in a module now
by Peter Dunkley 30 Mar '13

30 Mar '13

Module: sip-router Branch: master Commit: e090a714728950b40cf09956137db4ce93d08960 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e090a71… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 29 21:49:29 2013 +0000 modules/outbound: updated to reflect STUN being in a module now --- modules/outbound/README | 20 +++++++------------- modules/outbound/doc/outbound_admin.xml | 11 ++--------- modules/outbound/ob_mod.c | 9 --------- 3 files changed, 9 insertions(+), 31 deletions(-) diff --git a/modules/outbound/README b/modules/outbound/README index 3a8c558..e90fd62 100644 --- a/modules/outbound/README +++ b/modules/outbound/README @@ -30,10 +30,9 @@ Peter Dunkley List of Examples - 1.1. Compiling Kamailio with STUN support - 1.2. Edge Proxy Configuration - 1.3. Registrar Configuration - 1.4. Set force_outbound_flag parameter + 1.1. Edge Proxy Configuration + 1.2. Registrar Configuration + 1.3. Set force_outbound_flag parameter Chapter 1. Admin Guide @@ -70,12 +69,7 @@ Chapter 1. Admin Guide 1.1. Edge Proxy Keep-Alives (STUN) Outbound Edge Proxies MUST support STUN NAT keep-alives on their SIP - UDP ports. Kamailio supports this as a compile-time option that is - disabled by default. - - Example 1.1. Compiling Kamailio with STUN support -make FLAVOUR=kamailio cfg STUN=1 -make all + UDP ports. Kamailio supports this though the “stun” module. 1.2. Flow Timer @@ -98,7 +92,7 @@ make all the Registrar flow timer interval and a little less than the “tcp_connection_lifetime”. - Example 1.2. Edge Proxy Configuration + Example 1.1. Edge Proxy Configuration #!KAMAILIO # # Edge proxy configuration @@ -265,7 +259,7 @@ failure_route[FAIL_OUTBOUND]{ } } - Example 1.3. Registrar Configuration + Example 1.2. Registrar Configuration ... loadmodule "tm.so" ... @@ -353,7 +347,7 @@ failure_route[FAIL_OUTBOUND] { Default value is -1. - Example 1.4. Set force_outbound_flag parameter + Example 1.3. Set force_outbound_flag parameter ... modparam("outbound", "force_outbound_flag", 1) ... diff --git a/modules/outbound/doc/outbound_admin.xml b/modules/outbound/doc/outbound_admin.xml index 2582caa..47bb578 100644 --- a/modules/outbound/doc/outbound_admin.xml +++ b/modules/outbound/doc/outbound_admin.xml @@ -22,15 +22,8 @@ <section> <title>Edge Proxy Keep-Alives (STUN)</title> <para>Outbound Edge Proxies MUST support STUN NAT keep-alives - on their SIP UDP ports. &kamailio; supports this as a - compile-time option that is disabled by default.</para> - <example> - <title>Compiling &kamailio; with STUN support</title> - <programlisting><![CDATA[ -make FLAVOUR=kamailio cfg STUN=1 -make all -]]></programlisting> - </example> + on their SIP UDP ports. &kamailio; supports this though the + <quote>stun</quote> module.</para> </section> <section> <title>Flow Timer</title> diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c index 3f76433..04b1dfa 100644 --- a/modules/outbound/ob_mod.c +++ b/modules/outbound/ob_mod.c @@ -98,15 +98,6 @@ static int mod_init(void) "random bytes\n", ob_key.len); } -#ifndef USE_STUN - LM_WARN("STUN support not built-in. UDP keep-alive not supported.\n"); -#else - if (stun_allow_stun != 1) - { - LM_WARN("STUN disabled. UDP keep-alive not supported.\n"); - } -#endif - return 0; }

2 1

git:master: snmpstats Add support for the Websocket module statistics
by Olle E. Johansson 30 Mar '13

30 Mar '13

Module: sip-router Branch: master Commit: f139948421f2232efae6c2bdd6ea95547b6de533 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f139948… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sat Mar 30 09:49:16 2013 +0100 snmpstats Add support for the Websocket module statistics Hint to developers: If you add statistics and selects in your module, you make it very easy to add SNMP support for your module. Then SNMPstats can just use generic APIs to find your data. Please also add a generic way of finding out if a module is configured and used too, if possible. Sometimes modules are just loaded, but not used anywhere. Better to reflect real data in SNMP if possible. Using the old "SER" way of using selects for config data that is allowed to change at runtime opens up for SNMP writes to manage your module as well. And of course, using selects and counters/statistics variables also helps the RPC interface, so it's both cool and the Right Thing To Do (TM). Yes, commit messages can be informative as well. :-) --- modules/snmpstats/kamailioNet.c | 279 ++++++++++++++++++++++++++++++++++- modules/snmpstats/kamailioNet.h | 9 + modules/snmpstats/mibs/KAMAILIO-MIB | 104 +++++++++++++- 3 files changed, 382 insertions(+), 10 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=f13…

1 0

git:master: core: set TOS for tcp IPv6 sockets
by Daniel-Constantin Mierla 30 Mar '13

30 Mar '13

Module: sip-router Branch: master Commit: b9476db0c1e1ce869c1da2f87dfaf411edf69277 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b9476db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Mar 30 09:24:19 2013 +0100 core: set TOS for tcp IPv6 sockets --- tcp_main.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/tcp_main.c b/tcp_main.c index 9d3359e..8a650a1 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -373,7 +373,7 @@ static inline int init_sock_keepalive(int s) * disable nagle, tos lowdelay, reuseaddr, non-blocking * * return -1 on error */ -static int init_sock_opt(int s) +static int init_sock_opt(int s, int af) { int flags; int optval; @@ -388,11 +388,24 @@ static int init_sock_opt(int s) #endif /* tos*/ optval = tos; - if (setsockopt(s, IPPROTO_IP, IP_TOS, (void*)&optval,sizeof(optval)) ==-1){ - LOG(L_WARN, "WARNING: init_sock_opt: setsockopt tos: %s\n", - strerror(errno)); - /* continue since this is not critical */ + if(af==AF_INET){ + if (setsockopt(s, IPPROTO_IP, IP_TOS, (void*)&optval, + sizeof(optval)) ==-1){ + LOG(L_WARN, "WARNING: init_sock_opt: setsockopt tos: %s\n", + strerror(errno)); + /* continue since this is not critical */ + } +#ifdef USE_IPV6 + } else if(af==AF_INET6){ + if (setsockopt(s, IPPROTO_IPV6, IPV6_TCLASS, + (void*)&optval, sizeof(optval)) ==-1) { + LOG(L_WARN, "WARNING: init_sock_opt: setsockopt v6 tos: %s\n", + strerror(errno)); + /* continue since this is not critical */ + } +#endif } + #if !defined(TCP_DONT_REUSEADDR) optval=1; if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, @@ -1140,7 +1153,7 @@ inline static int tcp_do_connect( union sockaddr_union* server, su2a(server, sizeof(*server)), errno, strerror(errno)); goto error; } - if (init_sock_opt(s)<0){ + if (init_sock_opt(s, server->s.sa_family)<0){ LOG(L_ERR, "ERROR: tcp_do_connect %s: init_sock_opt failed\n", su2a(server, sizeof(*server))); goto error;

1 0

git:master: core: set TOS for IPv6 sctp sockets
by Daniel-Constantin Mierla 30 Mar '13

30 Mar '13

Module: sip-router Branch: master Commit: b57f64533dbc538f3d5282d0196598062f0b4652 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b57f645… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Mar 30 09:15:00 2013 +0100 core: set TOS for IPv6 sctp sockets --- sctp_server.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/sctp_server.c b/sctp_server.c index fbe83ea..511842e 100644 --- a/sctp_server.c +++ b/sctp_server.c @@ -451,10 +451,22 @@ static int sctp_init_sock_opt_common(int s, int af) #endif /* set tos */ optval = tos; - if (setsockopt(s, IPPROTO_IP, IP_TOS, (void*)&optval,sizeof(optval)) ==-1){ - LOG(L_WARN, "WARNING: sctp_init_sock_opt_common: setsockopt tos: %s\n", - strerror(errno)); - /* continue since this is not critical */ + if(af==AF_INET){ + if (setsockopt(s, IPPROTO_IP, IP_TOS, (void*)&optval, + sizeof(optval)) ==-1){ + LM_WARN("sctp_init_sock_opt_common: setsockopt tos: %s\n", + strerror(errno)); + /* continue since this is not critical */ + } +#ifdef USE_IPV6 + } else if(af==AF_INET6){ + if (setsockopt(s, IPPROTO_IPV6, IPV6_TCLASS, + (void*)&optval, sizeof(optval)) ==-1) { + LM_WARN("sctp_init_sock_opt_common: setsockopt v6 tos: %s\n", + strerror(errno)); + /* continue since this is not critical */ + } +#endif } /* set receive buffer: SO_RCVBUF*/

1 0

git:master: app_lua: clean local reload array and shut down
by Daniel-Constantin Mierla 30 Mar '13

30 Mar '13

Module: sip-router Branch: master Commit: 222066ba16ec4b2064c4fc50e533e27f4c4fb74d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=222066b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 29 12:19:36 2013 +0100 app_lua: clean local reload array and shut down --- modules/app_lua/app_lua_api.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules/app_lua/app_lua_api.c b/modules/app_lua/app_lua_api.c index 0ec9123..78a98e4 100644 --- a/modules/app_lua/app_lua_api.c +++ b/modules/app_lua/app_lua_api.c @@ -357,6 +357,11 @@ void lua_sr_destroy(void) lock_set_dealloc( sr_lua_locks ); sr_lua_locks = 0; } + + if(_app_lua_sv!=NULL) { + pkg_free(_app_lua_sv); + _app_lua_sv = 0; + } } /**

1 0

git:4.0: modules/outbound: changed some INFO level output to DBG
by Peter Dunkley 29 Mar '13

29 Mar '13

Module: sip-router Branch: 4.0 Commit: 71dbcc196db780d5d8ca2960130850ace956ceca URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=71dbcc1… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 29 23:35:39 2013 +0000 modules/outbound: changed some INFO level output to DBG (cherry picked from commit ce0c420ba30388256e958a0bdf6d8f37138c3f97) --- modules/outbound/ob_mod.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c index 3f76433..3d4d967 100644 --- a/modules/outbound/ob_mod.c +++ b/modules/outbound/ob_mod.c @@ -283,7 +283,7 @@ static int use_outbound_register(struct sip_msg *msg) if (!(parse_headers(msg, HDR_VIA2_F, 0) == -1 || msg->via2 == 0 || msg->via2->error != PARSE_OK)) { - LM_INFO("second Via: found - outbound not used\n"); + LM_DBG("second Via: found - outbound not used\n"); return 0; } @@ -305,14 +305,14 @@ static int use_outbound_register(struct sip_msg *msg) if (contact->reg_id) { - LM_INFO("found REGISTER with ;reg-id paramter on" + LM_DBG("found REGISTER with ;reg-id paramter on" " Contact-URI - outbound used\n"); return 1; } } - LM_INFO("outbound not used\n"); + LM_DBG("outbound not used\n"); return 0; } @@ -353,7 +353,7 @@ static int use_outbound_non_reg(struct sip_msg *msg) { /* If the host:port doesn't match, or does but it's gruu */ - LM_INFO("top Route-URI is not me - outbound not" + LM_DBG("top Route-URI is not me - outbound not" " used\n"); return 0; } @@ -367,7 +367,7 @@ static int use_outbound_non_reg(struct sip_msg *msg) if (hooks.uri.ob) { - LM_INFO("found ;ob parameter on Route-URI - outbound" + LM_DBG("found ;ob parameter on Route-URI - outbound" " used\n"); if (decode_flow_token(&rcv, puri.user) == 0) @@ -375,12 +375,12 @@ static int use_outbound_non_reg(struct sip_msg *msg) if (!ip_addr_cmp(&rcv.src_ip, &msg->rcv.src_ip) || rcv.src_port != msg->rcv.src_port) { - LM_INFO("\"incoming\" request found\n"); + LM_DBG("\"incoming\" request found\n"); return 2; } } - LM_INFO("\"outgoing\" request found\n"); + LM_DBG("\"outgoing\" request found\n"); return 1; } } @@ -389,7 +389,7 @@ static int use_outbound_non_reg(struct sip_msg *msg) if (!(parse_headers(msg, HDR_VIA2_F, 0) == -1 || msg->via2 == 0 || msg->via2->error != PARSE_OK)) { - LM_INFO("second Via: found - outbound not used\n"); + LM_DBG("second Via: found - outbound not used\n"); return 0; } @@ -423,13 +423,13 @@ static int use_outbound_non_reg(struct sip_msg *msg) } if (hooks.contact.ob) { - LM_INFO("found ;ob parameter on Contact-URI - outbound" + LM_DBG("found ;ob parameter on Contact-URI - outbound" " used\n"); return 1; } } - LM_INFO("outbound not used\n"); + LM_DBG("outbound not used\n"); return 0; } @@ -449,7 +449,7 @@ int use_outbound(struct sip_msg *msg) return 1; } - LM_INFO("Analysing %.*s for outbound markers\n", + LM_DBG("Analysing %.*s for outbound markers\n", msg->first_line.u.request.method.len, msg->first_line.u.request.method.s);

1 0

git:master: modules/outbound: changed some INFO level output to DBG
by Peter Dunkley 29 Mar '13

29 Mar '13

Module: sip-router Branch: master Commit: ce0c420ba30388256e958a0bdf6d8f37138c3f97 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ce0c420… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 29 23:35:39 2013 +0000 modules/outbound: changed some INFO level output to DBG --- modules/outbound/ob_mod.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c index 6cbc6d7..e5eea65 100644 --- a/modules/outbound/ob_mod.c +++ b/modules/outbound/ob_mod.c @@ -274,7 +274,7 @@ static int use_outbound_register(struct sip_msg *msg) if (!(parse_headers(msg, HDR_VIA2_F, 0) == -1 || msg->via2 == 0 || msg->via2->error != PARSE_OK)) { - LM_INFO("second Via: found - outbound not used\n"); + LM_DBG("second Via: found - outbound not used\n"); return 0; } @@ -296,14 +296,14 @@ static int use_outbound_register(struct sip_msg *msg) if (contact->reg_id) { - LM_INFO("found REGISTER with ;reg-id paramter on" + LM_DBG("found REGISTER with ;reg-id paramter on" " Contact-URI - outbound used\n"); return 1; } } - LM_INFO("outbound not used\n"); + LM_DBG("outbound not used\n"); return 0; } @@ -344,7 +344,7 @@ static int use_outbound_non_reg(struct sip_msg *msg) { /* If the host:port doesn't match, or does but it's gruu */ - LM_INFO("top Route-URI is not me - outbound not" + LM_DBG("top Route-URI is not me - outbound not" " used\n"); return 0; } @@ -358,7 +358,7 @@ static int use_outbound_non_reg(struct sip_msg *msg) if (hooks.uri.ob) { - LM_INFO("found ;ob parameter on Route-URI - outbound" + LM_DBG("found ;ob parameter on Route-URI - outbound" " used\n"); if (decode_flow_token(msg, &rcv, puri.user) == 0) @@ -366,12 +366,12 @@ static int use_outbound_non_reg(struct sip_msg *msg) if (!ip_addr_cmp(&rcv->src_ip, &msg->rcv.src_ip) || rcv->src_port != msg->rcv.src_port) { - LM_INFO("\"incoming\" request found\n"); + LM_DBG("\"incoming\" request found\n"); return 2; } } - LM_INFO("\"outgoing\" request found\n"); + LM_DBG("\"outgoing\" request found\n"); return 1; } } @@ -380,7 +380,7 @@ static int use_outbound_non_reg(struct sip_msg *msg) if (!(parse_headers(msg, HDR_VIA2_F, 0) == -1 || msg->via2 == 0 || msg->via2->error != PARSE_OK)) { - LM_INFO("second Via: found - outbound not used\n"); + LM_DBG("second Via: found - outbound not used\n"); return 0; } @@ -414,13 +414,13 @@ static int use_outbound_non_reg(struct sip_msg *msg) } if (hooks.contact.ob) { - LM_INFO("found ;ob parameter on Contact-URI - outbound" + LM_DBG("found ;ob parameter on Contact-URI - outbound" " used\n"); return 1; } } - LM_INFO("outbound not used\n"); + LM_DBG("outbound not used\n"); return 0; } @@ -440,7 +440,7 @@ int use_outbound(struct sip_msg *msg) return 1; } - LM_INFO("Analysing %.*s for outbound markers\n", + LM_DBG("Analysing %.*s for outbound markers\n", msg->first_line.u.request.method.len, msg->first_line.u.request.method.s);

1 0

git:master: modules/outbound: fixed segmentation fault
by Peter Dunkley 29 Mar '13

29 Mar '13

Module: sip-router Branch: master Commit: 7dfdcfed55916cce7541d28251cb4c82a0823829 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7dfdcfe… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 29 23:31:39 2013 +0000 modules/outbound: fixed segmentation fault --- modules/outbound/api.h | 2 +- modules/outbound/ob_mod.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/outbound/api.h b/modules/outbound/api.h index 16c2f2e..2667fde 100644 --- a/modules/outbound/api.h +++ b/modules/outbound/api.h @@ -28,7 +28,7 @@ #include "../../sr_module.h" typedef int (*encode_flow_token_t)(str *, struct receive_info); -typedef int (*decode_flow_token_t)(struct sip_msg *, struct receive_info *, str); +typedef int (*decode_flow_token_t)(struct sip_msg *, struct receive_info **, str); typedef int (*use_outbound_t)(struct sip_msg *); typedef struct ob_binds { diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c index ed87320..6cbc6d7 100644 --- a/modules/outbound/ob_mod.c +++ b/modules/outbound/ob_mod.c @@ -185,7 +185,7 @@ int encode_flow_token(str *flow_token, struct receive_info rcv) return 0; } -int decode_flow_token(struct sip_msg *msg, struct receive_info *rcv, str flow_token) +int decode_flow_token(struct sip_msg *msg, struct receive_info **rcv, str flow_token) { int pos = FLOW_TOKEN_START_POS, flow_length, i; @@ -262,7 +262,7 @@ int decode_flow_token(struct sip_msg *msg, struct receive_info *rcv, str flow_to msg->flow.decoded = 1; end: - rcv = &msg->flow.rcv; + *rcv = &msg->flow.rcv; return 0; } @@ -361,7 +361,7 @@ static int use_outbound_non_reg(struct sip_msg *msg) LM_INFO("found ;ob parameter on Route-URI - outbound" " used\n"); - if (decode_flow_token(msg, rcv, puri.user) == 0) + if (decode_flow_token(msg, &rcv, puri.user) == 0) { if (!ip_addr_cmp(&rcv->src_ip, &msg->rcv.src_ip) || rcv->src_port != msg->rcv.src_port)

1 0

git:master: modules/outbound: cache decoded flow-token in sip_msg structure
by Peter Dunkley 29 Mar '13

29 Mar '13

Module: sip-router Branch: master Commit: 2bff7566a0506ea06ab2de735db30af3e4c9c110 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2bff756… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 29 23:11:24 2013 +0000 modules/outbound: cache decoded flow-token in sip_msg structure - Saves multiple OpenSSL calls if the same flow-token is needed in more than one place --- modules/outbound/api.h | 2 +- modules/outbound/ob_mod.c | 48 ++++++++++++++++++++++---------------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/modules/outbound/api.h b/modules/outbound/api.h index 620b745..16c2f2e 100644 --- a/modules/outbound/api.h +++ b/modules/outbound/api.h @@ -28,7 +28,7 @@ #include "../../sr_module.h" typedef int (*encode_flow_token_t)(str *, struct receive_info); -typedef int (*decode_flow_token_t)(struct receive_info *, str); +typedef int (*decode_flow_token_t)(struct sip_msg *, struct receive_info *, str); typedef int (*use_outbound_t)(struct sip_msg *); typedef struct ob_binds { diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c index 04b1dfa..ed87320 100644 --- a/modules/outbound/ob_mod.c +++ b/modules/outbound/ob_mod.c @@ -185,15 +185,12 @@ int encode_flow_token(str *flow_token, struct receive_info rcv) return 0; } -int decode_flow_token(struct receive_info *rcv, str flow_token) +int decode_flow_token(struct sip_msg *msg, struct receive_info *rcv, str flow_token) { int pos = FLOW_TOKEN_START_POS, flow_length, i; - if (rcv == NULL) - { - LM_ERR("bad receive_info structure provided\n"); - return -1; - } + if (msg->flow.decoded) + goto end; if (flow_token.s == NULL) { @@ -241,28 +238,31 @@ int decode_flow_token(struct receive_info *rcv, str flow_token) /* Decode protocol information */ if (unenc_flow_token[pos] & 0x80) { - rcv->dst_ip.af = rcv->src_ip.af = AF_INET6; - rcv->dst_ip.len = rcv->src_ip.len = 16; + msg->flow.rcv.dst_ip.af = msg->flow.rcv.src_ip.af = AF_INET6; + msg->flow.rcv.dst_ip.len = msg->flow.rcv.src_ip.len = 16; } else { - rcv->dst_ip.af = rcv->src_ip.af = AF_INET; - rcv->dst_ip.len = rcv->src_ip.len = 4; + msg->flow.rcv.dst_ip.af = msg->flow.rcv.src_ip.af = AF_INET; + msg->flow.rcv.dst_ip.len = msg->flow.rcv.src_ip.len = 4; } - rcv->proto = unenc_flow_token[pos++] & 0x7f; + msg->flow.rcv.proto = unenc_flow_token[pos++] & 0x7f; /* Decode destination address */ - for (i = 0; i < (rcv->dst_ip.af == AF_INET6 ? 16 : 4); i++) - rcv->dst_ip.u.addr[i] = unenc_flow_token[pos++]; - rcv->dst_port = unenc_flow_token[pos++] << 8; - rcv->dst_port |= unenc_flow_token[pos++]; + for (i = 0; i < (msg->flow.rcv.dst_ip.af == AF_INET6 ? 16 : 4); i++) + msg->flow.rcv.dst_ip.u.addr[i] = unenc_flow_token[pos++]; + msg->flow.rcv.dst_port = unenc_flow_token[pos++] << 8; + msg->flow.rcv.dst_port |= unenc_flow_token[pos++]; /* Decode source address */ - for (i = 0; i < (rcv->src_ip.af == AF_INET6 ? 16 : 4); i++) - rcv->src_ip.u.addr[i] = unenc_flow_token[pos++]; - rcv->src_port = unenc_flow_token[pos++] << 8; - rcv->src_port |= unenc_flow_token[pos++]; - + for (i = 0; i < (msg->flow.rcv.src_ip.af == AF_INET6 ? 16 : 4); i++) + msg->flow.rcv.src_ip.u.addr[i] = unenc_flow_token[pos++]; + msg->flow.rcv.src_port = unenc_flow_token[pos++] << 8; + msg->flow.rcv.src_port |= unenc_flow_token[pos++]; + msg->flow.decoded = 1; + +end: + rcv = &msg->flow.rcv; return 0; } @@ -315,7 +315,7 @@ static int use_outbound_non_reg(struct sip_msg *msg) param_hooks_t hooks; param_t *params; int ret; - struct receive_info rcv; + struct receive_info *rcv = NULL; /* Check to see if the top Route-URI is me and has a ;ob parameter */ if (msg->route @@ -361,10 +361,10 @@ static int use_outbound_non_reg(struct sip_msg *msg) LM_INFO("found ;ob parameter on Route-URI - outbound" " used\n"); - if (decode_flow_token(&rcv, puri.user) == 0) + if (decode_flow_token(msg, rcv, puri.user) == 0) { - if (!ip_addr_cmp(&rcv.src_ip, &msg->rcv.src_ip) - || rcv.src_port != msg->rcv.src_port) + if (!ip_addr_cmp(&rcv->src_ip, &msg->rcv.src_ip) + || rcv->src_port != msg->rcv.src_port) { LM_INFO("\"incoming\" request found\n"); return 2;

1 0

git:master: modules/rr: fixed outbound related segmentation fault
by Peter Dunkley 29 Mar '13

29 Mar '13

Module: sip-router Branch: master Commit: bce42abfd19f5beb26fc27ab77fed5f679a378ee URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bce42ab… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 29 23:31:54 2013 +0000 modules/rr: fixed outbound related segmentation fault --- modules/rr/loose.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/rr/loose.c b/modules/rr/loose.c index a989b0a..5ea4aa3 100644 --- a/modules/rr/loose.c +++ b/modules/rr/loose.c @@ -510,7 +510,7 @@ static inline int process_outbound(struct sip_msg *_m, str flow_token, if (!rr_obb.decode_flow_token) return 0; - ret = rr_obb.decode_flow_token(_m, rcv, flow_token); + ret = rr_obb.decode_flow_token(_m, &rcv, flow_token); if (ret == -2) { LM_DBG("no flow token found - outbound not in use\n");

1 0

← Newer
1
2
3
4
5
6
7
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2013