sr-dev September 2011

sr-dev@lists.kamailio.org

40 participants
298 discussions

git:3.1: rr(k): execute callbacks only for local route uri

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: b4fae8b9eee6d893aa2591bcc9039ea53a142161 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b4fae8b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 14 11:19:56 2011 +0200 rr(k): execute callbacks only for local route uri - parameters callback are executed only if there is a list with parameters in Route URI and for loose routing the URI has to match myself condition - should fix bogus value of Route URI params in callback function when URI of top Route is not myself - reported by Andreas Granig (cherry picked from commit 10eac9b125ff2a13a2ae240897a3f17bc1243c71) --- modules_k/rr/loose.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/modules_k/rr/loose.c b/modules_k/rr/loose.c index a6d7e44..5c8b244 100644 --- a/modules_k/rr/loose.c +++ b/modules_k/rr/loose.c @@ -581,6 +581,11 @@ static inline int after_strict(struct sip_msg* _m) rt = (rr_t*)hdr->parsed; uri = rt->nameaddr.uri; + /* reset rr handling static vars for safety in error case */ + routed_msg_id = 0; + routed_params.s = NULL; + routed_params.len = 0; + if (parse_uri(uri.s, uri.len, &puri) < 0) { LM_ERR("failed to parse the first route URI\n"); return RR_ERROR; @@ -734,8 +739,9 @@ static inline int after_strict(struct sip_msg* _m) } } - /* run RR callbacks */ - run_rr_callbacks( _m, &routed_params ); + /* run RR callbacks only if we have Route URI parameters */ + if(routed_params.len > 0) + run_rr_callbacks( _m, &routed_params ); return RR_DRIVEN; } @@ -764,6 +770,11 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) rt = (rr_t*)hdr->parsed; uri = rt->nameaddr.uri; + /* reset rr handling static vars for safety in error case */ + routed_msg_id = 0; + routed_params.s = NULL; + routed_params.len = 0; + if (parse_uri(uri.s, uri.len, &puri) < 0) { LM_ERR("failed to parse the first route URI\n"); return RR_ERROR; @@ -889,8 +900,9 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) status = RR_DRIVEN; done: - /* run RR callbacks */ - run_rr_callbacks( _m, &routed_params ); + /* run RR callbacks only if we have Route URI parameters */ + if(routed_params.len > 0) + run_rr_callbacks( _m, &routed_params ); return status; }

13 years

git:master: rr(k): execute callbacks only for local route uri

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 10eac9b125ff2a13a2ae240897a3f17bc1243c71 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=10eac9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 14 11:19:56 2011 +0200 rr(k): execute callbacks only for local route uri - parameters callback are executed only if there is a list with parameters in Route URI and for loose routing the URI has to match myself condition - should fix bogus value of Route URI params in callback function when URI of top Route is not myself - reported by Andreas Granig --- modules_k/rr/loose.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/modules_k/rr/loose.c b/modules_k/rr/loose.c index 53a52d6..7d2c0e2 100644 --- a/modules_k/rr/loose.c +++ b/modules_k/rr/loose.c @@ -497,6 +497,11 @@ static inline int after_strict(struct sip_msg* _m) rt = (rr_t*)hdr->parsed; uri = rt->nameaddr.uri; + /* reset rr handling static vars for safety in error case */ + routed_msg_id = 0; + routed_params.s = NULL; + routed_params.len = 0; + if (parse_uri(uri.s, uri.len, &puri) < 0) { LM_ERR("failed to parse the first route URI\n"); return RR_ERROR; @@ -651,8 +656,9 @@ static inline int after_strict(struct sip_msg* _m) } } - /* run RR callbacks */ - run_rr_callbacks( _m, &routed_params ); + /* run RR callbacks only if we have Route URI parameters */ + if(routed_params.len > 0) + run_rr_callbacks( _m, &routed_params ); return RR_DRIVEN; } @@ -681,6 +687,11 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) rt = (rr_t*)hdr->parsed; uri = rt->nameaddr.uri; + /* reset rr handling static vars for safety in error case */ + routed_msg_id = 0; + routed_params.s = NULL; + routed_params.len = 0; + if (parse_uri(uri.s, uri.len, &puri) < 0) { LM_ERR("failed to parse the first route URI\n"); return RR_ERROR; @@ -807,8 +818,9 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) status = RR_DRIVEN; done: - /* run RR callbacks */ - run_rr_callbacks( _m, &routed_params ); + /* run RR callbacks only if we have Route URI parameters */ + if(routed_params.len > 0) + run_rr_callbacks( _m, &routed_params ); return status; }

13 years

Nightly build failed for branch 3.1

by Jon Bonilla

Hi all The nightly builds of 3.1 branch failed tonight. Here's the log: make[1]: se ingresa al directorio `/usr/src/kamailio/kamailiogitsrc-3.1' CC (gcc) [M peering.so] peering.o CC (gcc) [M peering.so] verify.o make[3]: `libkcore.so.1.0' está actualizado. LD (gcc) [M peering.so] peering.so CC (gcc) [M acc_radius.so] acc_radius.o LD (gcc) [M acc_radius.so] acc_radius.so CC (gcc) [M auth_radius.so] authorize.o authorize.c: In function ‘authenticate’: authorize.c:176: error: ‘NONCE_REUSED’ undeclared (first use in this function) authorize.c:176: error: (Each undeclared identifier is reported only once authorize.c:176: error: for each function it appears in.) authorize.c:178: error: ‘AUTH_NONCE_REUSED’ undeclared (first use in this function) authorize.c:180: error: ‘STALE_NONCE’ undeclared (first use in this function) authorize.c:182: error: ‘AUTH_STALE_NONCE’ undeclared (first use in this function) authorize.c:184: error: ‘NO_CREDENTIALS’ undeclared (first use in this function) authorize.c:186: error: ‘AUTH_NO_CREDENTIALS’ undeclared (first use in this function) make[2]: *** [authorize.o] Error 1 make[1]: *** [modules_s] Error 1 make[1]: se sale del directorio `/usr/src/kamailio/kamailiogitsrc-3.1' make: *** [build-stamp] Error 2 dpkg-buildpackage: fallo: debian/rules build devolvió un estado de salida de error 2

13 years

git:3.1: Revert "auth_radius(s): use the update pre_auth"

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 471b7780706efa2086fe2d1a614ec84cb1c4b19d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=471b778… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 14 10:54:15 2011 +0200 Revert "auth_radius(s): use the update pre_auth" - reverted invalid backport mistakenly selected This reverts commit 7c9a316c78c670889ee55772a5d2e8e72a6808d3. --- modules_s/auth_radius/authorize.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/modules_s/auth_radius/authorize.c b/modules_s/auth_radius/authorize.c index 0027e3c..45809c7 100644 --- a/modules_s/auth_radius/authorize.c +++ b/modules_s/auth_radius/authorize.c @@ -173,17 +173,6 @@ static inline int authenticate(struct sip_msg* msg, str* realm, #ifdef EXTRA_DEBUG abort(); #endif - case NONCE_REUSED: - LM_DBG("nonce reused"); - ret = AUTH_NONCE_REUSED; - goto end; - case STALE_NONCE: - LM_DBG("stale nonce\n"); - ret = AUTH_STALE_NONCE; - goto end; - case NO_CREDENTIALS: - LM_DBG("no credentials\n"); - ret = AUTH_NO_CREDENTIALS; case ERROR: case BAD_CREDENTIALS: ret = -3;

13 years

git:3.1: core: fixed via branch value in ack to 200 ok

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 13703fac521feb3662cbce921a8ba0f299d001e2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=13703fa… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 20 23:08:24 2011 +0300 core: fixed via branch value in ack to 200 ok - By default, sr was using non-rfc3261 compliant via branch value when it generated ack to 200 ok. (cherry picked from commit ebb3b085c15b398192cd8e242d46914252278448) --- forward.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forward.c b/forward.c index aa71780..36092d8 100644 --- a/forward.c +++ b/forward.c @@ -545,8 +545,8 @@ int forward_request(struct sip_msg* msg, str* dst, unsigned short port, value in there; better for performance */ if (syn_branch ) { - *msg->add_to_branch_s='0'; - msg->add_to_branch_len=1; + memcpy(msg->add_to_branch_s, "z9hG4bKcydzigwkX", 16); + msg->add_to_branch_len=16; } else { if (!char_msg_val( msg, md5 )) { /* parses transaction key */ LOG(L_ERR, "ERROR: forward_request: char_msg_val failed\n");

13 years

git:3.1: auth_radius(s): use the update pre_auth

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 7c9a316c78c670889ee55772a5d2e8e72a6808d3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7c9a316… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Aug 22 11:45:38 2011 +0200 auth_radius(s): use the update pre_auth Handle the new pre_auth returns. (cherry picked from commit 01a0bfd830a4efb5e2f8d26fbaf80297eb5a1ba3) --- modules_s/auth_radius/authorize.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/modules_s/auth_radius/authorize.c b/modules_s/auth_radius/authorize.c index 45809c7..0027e3c 100644 --- a/modules_s/auth_radius/authorize.c +++ b/modules_s/auth_radius/authorize.c @@ -173,6 +173,17 @@ static inline int authenticate(struct sip_msg* msg, str* realm, #ifdef EXTRA_DEBUG abort(); #endif + case NONCE_REUSED: + LM_DBG("nonce reused"); + ret = AUTH_NONCE_REUSED; + goto end; + case STALE_NONCE: + LM_DBG("stale nonce\n"); + ret = AUTH_STALE_NONCE; + goto end; + case NO_CREDENTIALS: + LM_DBG("no credentials\n"); + ret = AUTH_NO_CREDENTIALS; case ERROR: case BAD_CREDENTIALS: ret = -3;

13 years

Via parser does not accept any token as transport

by Iñaki Baz Castillo

Hi, sip-router Via parser is not RFC compliant as it does not accept any token in the transport (even if this does NOT occur in the top Via). A real example: kamailio receives a REGISTER like this (removing other headers): REGISTER sip:domain,org SIP/2.0 Via: SIP/2.0/UDP 1.2.3.4:9090;branch=z9hG4bK3afb3d8e9ea4c4259f9d;rport Via: SIP/2.0/WS 1.2.3.4:36638;branch=z9hG4bK5089;received=9.9.9.9;rport=36638 And it fails parsing so also processing the request: ERROR: <core> [parser/parse_via.c:1677]: ERROR: parse_via: bad char <W> on state 122 ERROR: <core> [parser/parse_via.c:2366]: ERROR: parse_via on: <SIP/2.0/UDP 1.2.3.4:9090;branch=z9hG4bK3afb3d8e9ea4c4259f9d;rport [...]> ERROR: <core> [parser/parse_via.c:2370]: ERROR: parse_via parse error, parsed so far:<SIP/2.0/> ERROR: <core> [parser/msg_parser.c:139]: ERROR: get_hdr_field: bad via INFO: <core> [parser/msg_parser.c:353]: ERROR: bad header field [Via: SIP/2.0/WS 1.2.] Please, make it possible for the Via transport to contain an unknown token, at least when it does NOT occur in the top Via header. Why should Kamailio care about the second Via transport field? I strongly need it as, obviously I'm involved in SIP over an unknown transport (yet), and this is a show-stopper. Thanks a lot. -- Iñaki Baz Castillo <ibc(a)aliax.net>

13 years

git:jh/mtree DELETED: modules/utils: check in_list() separator already in fixup function

by Juha Heinanen

Module: sip-router Branch: jh/mtree DELETED Commit: 36c2ea8fe8a9e2967d7ca66c5bd7d385f671298d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=36c2ea8… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Sep 1 11:36:33 2011 +0300 modules/utils: check in_list() separator already in fixup function --- modules/utils/functions.c | 11 +---------- modules/utils/utils.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/modules/utils/functions.c b/modules/utils/functions.c index bdd4491..a95e8f6 100644 --- a/modules/utils/functions.c +++ b/modules/utils/functions.c @@ -185,16 +185,7 @@ int in_list(struct sip_msg* _m, char* _subject, char* _list, char* _sep) if (list.len == 0) return -1; } - if (strlen(_sep) != 1) { - LM_ERR("separator needs to be a one charter string\n"); - return -1; - } else { - sep = _sep[0]; - if (sep == 0) { - LM_INFO("separator cannot be NUL\n"); - return -1; - } - } + sep = _sep[0]; at = list.s; past = list.s + list.len; diff --git a/modules/utils/utils.c b/modules/utils/utils.c index 88ea37f..7b5f38b 100644 --- a/modules/utils/utils.c +++ b/modules/utils/utils.c @@ -372,8 +372,14 @@ static int fixup_free_http_query(void** param, int param_no) static int fixup_in_list(void** param, int param_no) { if ((param_no == 1) || (param_no == 2)) return fixup_spve_null(param, 1); - - if (param_no == 3) return 0; + + if (param_no == 3) { + if ((strlen((char *)*param) != 1) || (*((char *)(*param)) == 0)) { + LM_ERR("invalid separator parameter\n"); + return -1; + } + return 0; + } LM_ERR("invalid parameter number <%d>\n", param_no); return -1; @@ -388,7 +394,7 @@ static int fixup_free_in_list(void** param, int param_no) LM_WARN("free function has not been defined for spve\n"); return 0; } - + if (param_no == 3) return 0; LM_ERR("invalid parameter number <%d>\n", param_no);

13 years

git.sip-router.org broken?!

by marius zbihlei

Hello, Any ideas why: marius@marius:~/dev/sip-router$ git pull --rebase ssh: connect to host git.sip-router.org port 22: Connection timed out fatal: The remote end hung up unexpectedly marius@marius:~/dev/sip-router$ ping git.sip-router.org PING git.sip-router.org (78.46.218.34) 56(84) bytes of data. ^C --- git.sip-router.org ping statistics --- 4 packets transmitted, 0 received, 100% packet loss, time 3025ms Seems the host is down :( Marius -- Zbihlei Marius Head of Linux Development Services Romania 1&1 Internet Development srl Tel KA: 754-9512 Str Mircea Eliade 18 Tel RO: +40-31-223-9512 Sect 1, Bucuresti mailto: marius.zbihlei(a)1and1.ro 71295, Romania

13 years

git:master: modules/lcr: added PROTO_OTHER case to which in order to get rid of warning

by Juha Heinanen

Module: sip-router Branch: master Commit: 65c6b1e6367cd01149e70c49140322b563a27e4a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=65c6b1e… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Sep 14 10:16:01 2011 +0300 modules/lcr: added PROTO_OTHER case to which in order to get rid of warning --- modules/lcr/lcr_rpc.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/lcr/lcr_rpc.c b/modules/lcr/lcr_rpc.c index 8f74f5d..b32b697 100644 --- a/modules/lcr/lcr_rpc.c +++ b/modules/lcr/lcr_rpc.c @@ -111,6 +111,9 @@ static void dump_gws(rpc_t* rpc, void* c) case PROTO_SCTP: rpc->struct_add(st, "s", "transport", "SCTP"); break; + case PROTO_OTHER: + rpc->struct_add(st, "s", "transport", "OTHER"); + break; case PROTO_NONE: break; }

13 years

← Newer
1
...
14
15
16
17
18
19
20
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2011