sr-dev October 2009

sr-dev@lists.kamailio.org

30 participants
468 discussions

git:sr_3.0: core: dset minor cleanups
by Andrei Pelinescu-Onciul 31 Oct '09

31 Oct '09

Module: sip-router Branch: sr_3.0 Commit: cbf1b7793d1b3f7d44b38144608905b90568251b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cbf1b77… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Oct 31 10:31:18 2009 +0100 core: dset minor cleanups - get_request_uri() is now inline and uses GET_RURI - DBG msg removed --- dset.c | 20 -------------------- dset.h | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dset.c b/dset.c index 08b67ba..77c3cea 100644 --- a/dset.c +++ b/dset.c @@ -437,24 +437,6 @@ qvalue_t get_ruri_q(void) /* - * Get actual Request-URI - */ -int get_request_uri(struct sip_msg* _m, str* _u) -{ - /* Use new_uri if present */ - if (_m->new_uri.s) { - _u->s = _m->new_uri.s; - _u->len = _m->new_uri.len; - } else { - _u->s = _m->first_line.u.request.uri.s; - _u->len = _m->first_line.u.request.uri.len; - } - - return 0; -} - - -/* * Rewrite Request-URI */ int rewrite_uri(struct sip_msg* _m, str* _s) @@ -478,8 +460,6 @@ int rewrite_uri(struct sip_msg* _m, str* _s) _m->new_uri.s = buf; _m->new_uri.len = _s->len; - DBG("rewrite_uri: Rewriting Request-URI with '%.*s'\n", _s->len, - buf); return 1; } diff --git a/dset.h b/dset.h index f24f5c9..0943097 100644 --- a/dset.h +++ b/dset.h @@ -31,8 +31,8 @@ #include "ip_addr.h" #include "qvalue.h" #include "flags.h" +#include "parser/msg_parser.h" -struct sip_msg; extern unsigned int nr_branches; @@ -118,7 +118,19 @@ void set_ruri_q(qvalue_t q); */ qvalue_t get_ruri_q(void); -int get_request_uri(struct sip_msg* _m, str* _u); + + +/* + * Get actual Request-URI + */ +inline static int get_request_uri(struct sip_msg* _m, str* _u) +{ + *_u=*GET_RURI(_m); + return 0; +} + + + int rewrite_uri(struct sip_msg* _m, str* _s); /**

1 0

git:sr_3.0: core: append_branch() sets also the send_socket, path & flags
by Andrei Pelinescu-Onciul 31 Oct '09

31 Oct '09

Module: sip-router Branch: sr_3.0 Commit: 394e061f8c582a4e146603934ef101f3bcd479db URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=394e061… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Oct 31 10:27:43 2009 +0100 core: append_branch() sets also the send_socket, path & flags - the script append_branch() sets also the new branch send_socket (if forced), path vector and branch flags, making it more compatible with the kamailio version. Reported-by: Juha Heinanen jh at tutpro com --- action.c | 9 +++++---- route.c | 11 +++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/action.c b/action.c index 1694419..b8256a7 100644 --- a/action.c +++ b/action.c @@ -339,15 +339,16 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) /* jku -- introduce a new branch */ case APPEND_BRANCH_T: - if ((a->val[0].type!=STRING_ST)) { + if (unlikely(a->val[0].type!=STR_ST)) { LOG(L_CRIT, "BUG: do_action: bad append_branch_t %d\n", a->val[0].type ); ret=E_BUG; goto error; } - ret=ser_append_branch( msg, a->val[0].u.string, - a->val[0].u.string ? strlen(a->val[0].u.string):0, - 0, 0, a->val[1].u.number, 0); + getbflagsval(0, (flag_t*)&flags); + ret=append_branch(msg, &a->val[0].u.str, &msg->dst_uri, + &msg->path_vec, a->val[1].u.number, + (flag_t)flags, msg->force_send_socket); break; /* jku begin: is_length_greater_than */ diff --git a/route.c b/route.c index fc25c64..8d6f2c6 100644 --- a/route.c +++ b/route.c @@ -976,6 +976,17 @@ int fix_actions(struct action* a) (unsigned int)t->val[0].u.number); } break; + case APPEND_BRANCH_T: + if (t->val[0].type!=STRING_ST){ + BUG("invalid subtype%d for append_branch_t\n", + t->val[0].type); + return E_BUG; + } + s.s=t->val[0].u.string; + s.len=(s.s)?strlen(s.s):0; + t->val[0].u.str=s; + t->val[0].type=STR_ST; + break; default: /* no fixup required for the rest */ break;

1 0

git:kamailio_3.0: core: re-initialize branch 0 flags for each new message
by Daniel-Constantin Mierla 31 Oct '09

31 Oct '09

Module: sip-router Branch: kamailio_3.0 Commit: a903310918e975c6f53f99e4d42c988baac28fae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a903310… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Oct 31 07:44:03 2009 +0100 core: re-initialize branch 0 flags for each new message Fixes branch 0 flags being "remembered" from previous script invocations. Reported-by: Juha Heinanen jh at tutpro com (cherry picked from commit c6dd54e8500b131a9dd53593afe009976ff3927f) --- dset.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dset.c b/dset.c index 5cc1b9f..08b67ba 100644 --- a/dset.c +++ b/dset.c @@ -231,6 +231,7 @@ void clear_branches(void) { nr_branches = 0; ruri_q = Q_UNSPECIFIED; + ruri_bflags = 0; }

1 0

looks like branch flags get corrupted
by jh＠tutpro.com 31 Oct '09

31 Oct '09

i started to wonder why my proxy is calling fix_natted_contact() in onreply route even when called ua is not behind nat. the function is called under condition if (isbflagset("TO_NATED") && t_check_status("18[0-9]|2[0-9][0-9]|3[0-9][0-9]")) { xlog("L_INFO", "Fixing nated contact in onreply_route\n"); fix_nated_contact(); }; i then added xlog telling if "TO_NATED" flags is set when request is sent out: if (isbflagset("TO_NATED")) { xlog("L_INFO", "Flag to_nated is set before t_relay\n"); } else { xlog("L_INFO", "Flag to_nated is NOT set before t_relay\n"); } it turns out that sometimes TO_NATED flag is set and sometimes not even when the calls are exactly identical. here is my example call: "jh" (behind nat) calls "foo", "foo" has forwarding on in the proxy to "test", which causes the request to be sent back to sr at 127.0.0.1:5070 (and then to "test", but the error has happened already and that is not shown). first example call where TO_NATED flag is set although it should not have been: Oct 30 20:45:29 localhost /usr/sbin/sip-proxy[31447]: INFO: INVITE <sip:foo@tutpro.com> is authorized Oct 30 20:45:29 localhost /usr/sbin/sip-proxy[31447]: INFO: Unconditional forwarding to <sip:test@tutpro.com> Oct 30 20:45:29 localhost /usr/sbin/sip-proxy[31447]: INFO: Fixing nated contact in handle_caller_nat Oct 30 20:45:29 localhost /usr/sbin/sip-proxy[31447]: INFO: Routing initial INVITE <sip:test@tutpro.com> to <sip:127.0.0.1:5070> Oct 30 20:45:29 localhost /usr/sbin/sip-proxy[31447]: INFO: Flag to_nated is set before t_relay ... second example call that works as it should: Oct 30 20:47:03 localhost /usr/sbin/sip-proxy[31441]: INFO: INVITE <sip:foo@tutpro.com> is authorized Oct 30 20:47:03 localhost /usr/sbin/sip-proxy[31441]: INFO: Unconditional forwarding to <sip:test@tutpro.com> Oct 30 20:47:03 localhost /usr/sbin/sip-proxy[31441]: INFO: Fixing nated contact in handle_caller_nat Oct 30 20:47:03 localhost /usr/sbin/sip-proxy[31441]: INFO: Routing initial INVITE <sip:test@tutpro.com> to <sip:127.0.0.1:5070> Oct 30 20:47:03 localhost /usr/sbin/sip-proxy[31441]: INFO: Flag to_nated is NOT set before t_relay ... the only conclusion that i can draw is that branch flags sometimes get somehow corrupted. let me know if you need more info or have ideas on how to find the cause of the problem. i do also have pcap traces. -- juha

2 3

git:sr_3.0: core: re-initialize branch 0 flags for each new message
by Andrei Pelinescu-Onciul 31 Oct '09

31 Oct '09

Module: sip-router Branch: sr_3.0 Commit: c6dd54e8500b131a9dd53593afe009976ff3927f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c6dd54e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Oct 31 07:44:03 2009 +0100 core: re-initialize branch 0 flags for each new message Fixes branch 0 flags being "remembered" from previous script invocations. Reported-by: Juha Heinanen jh at tutpro com --- dset.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dset.c b/dset.c index 5cc1b9f..08b67ba 100644 --- a/dset.c +++ b/dset.c @@ -231,6 +231,7 @@ void clear_branches(void) { nr_branches = 0; ruri_q = Q_UNSPECIFIED; + ruri_bflags = 0; }

1 0

git:sr_3.0: remove extra backslash in make modules-doc action
by Andrei Pelinescu-Onciul 31 Oct '09

31 Oct '09

Module: sip-router Branch: sr_3.0 Commit: 122dc6e47b9b67c314bb6203445afe2b7139d6b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=122dc6e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Oct 30 22:38:21 2009 +0100 remove extra backslash in make modules-doc action (cherry picked from commit f4cb4afc8173e209dbd7a6a522d3b10cc8c5c0ef) --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 258ac0e..e7b83d7 100644 --- a/Makefile +++ b/Makefile @@ -527,7 +527,7 @@ $(1)-doc: modules.lst @for r in $($(1)) "" ; do \ if [ -n "$$$$r" ]; then \ $(call oecho, "" ;) \ - $(call oecho, "" ;) \\ + $(call oecho, "" ;) \ $(MAKE) -C $$$$r/doc $(doc_format) $$(mk_params); \ fi ; \ done

1 0

Kamailio 3.0.0 RC1
by Daniel-Constantin Mierla 30 Oct '09

30 Oct '09

Hello, I created a tarball with sources of Kamailio 3.0.0 RC1 in order to easy the usage and testing: http://www.kamailio.org/pub/kamailio/3.0.0-rc1/src/kamailio-3.0.0-rc1_src.t… There is also now a tutorial to guide the installation of kamailio 3.0 branch from GIT repository: http://www.kamailio.org/dokuwiki/doku.php/install:kamailio-3.0.x-from-git Two wiki pages were created to collect what is new in Kamailio 3.0 and how to migrate to this version: http://www.kamailio.org/dokuwiki/doku.php/features:new-in-3.0.x http://www.kamailio.org/dokuwiki/doku.php/install:1.5.x-to-3.0.0 Both documents need a lot of care since many new features are missing or are not detailed, and definitely update guidelines do not cover all changes. Help is very much appreciated there. As we keep hunting and fixing issues, improve documentation, I hope to get to full release Kamailio 3.0.0 very soon. Enjoy RC1 meanwhile and report any issue you find to sr-dev(a)lists.sip-router.org. Thanks, Daniel

1 0

git:kamailio_3.0: remove extra backslash in make modules-doc action
by Daniel-Constantin Mierla 30 Oct '09

30 Oct '09

Module: sip-router Branch: kamailio_3.0 Commit: f4cb4afc8173e209dbd7a6a522d3b10cc8c5c0ef URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f4cb4af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 30 22:38:21 2009 +0100 remove extra backslash in make modules-doc action --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 5841f5d..2891d62 100644 --- a/Makefile +++ b/Makefile @@ -527,7 +527,7 @@ $(1)-doc: modules.lst @for r in $($(1)) "" ; do \ if [ -n "$$$$r" ]; then \ $(call oecho, "" ;) \ - $(call oecho, "" ;) \\ + $(call oecho, "" ;) \ $(MAKE) -C $$$$r/doc $(doc_format) $$(mk_params); \ fi ; \ done

1 0

git:kamailio_3.0: config cleanup
by Daniel-Constantin Mierla 30 Oct '09

30 Oct '09

Module: sip-router Branch: kamailio_3.0 Commit: 9069082a2d80b436779e805ee4da9703c4672d90 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9069082… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 30 20:58:11 2009 +0100 config cleanup - enclose several former commented features within defines - enabling such a feature requires just one 'define' as opposite of sed command used in 1.5 config --- etc/kamailio.cfg | 405 +++++++++++++++++++++++++++--------------------------- 1 files changed, 200 insertions(+), 205 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=906…

1 0

git:kamailio_3.0: tm: fix branches clearing lumps
by Daniel-Constantin Mierla 30 Oct '09

30 Oct '09

Module: sip-router Branch: kamailio_3.0 Commit: cfe339e04ce21b785642a026246618cf840ecad7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cfe339e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 30 15:19:42 2009 +0100 tm: fix branches clearing lumps - fix bug introduced in 610cb93 (cherry picked from commit 6a55e42edd0cf0ac82b2099a74b4896fdc801145) --- modules/tm/t_fwd.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index c917e2f..e4df337 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -232,8 +232,6 @@ static int prepare_new_uac( struct cell *t, struct sip_msg *i_req, #endif add_rm_backup = i_req->add_rm; body_lumps_backup = i_req->body_lumps; - i_req->add_rm=0; - i_req->body_lumps=0; if (unlikely(i_req->add_rm)){ i_req->add_rm = dup_lump_list(i_req->add_rm); if (unlikely(i_req->add_rm==0)){

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2009