sr-dev September 2010

sr-dev@lists.kamailio.org

25 participants
222 discussions

jabber module
by Ovidiu Sas 30 Sep '10

30 Sep '10

The jabber module is obsolete and it still exists in both (s) and (k) module version. We should remove this module from the upcoming 3.1 release. Regards, Ovidiu Sas

3 2

(k) radius accounting
by Ovidiu Sas 30 Sep '10

30 Sep '10

Starting with 3.1.x, (k) radius accounting is done via a new module (acc_radius). However, the acc module is still refering to radius files via the RAD_ACC flag. In order to keep the code clean, the RAD_ACC and the associated code should be removed from the acc module. If someone will compile kamailio with the RAD_ACC flag enabled an it will try to use radius accounting via the acc_radius module, we will have some conflicts: acc with radius enabled and acc_radius. Regards, Ovidiu Sas

1 0

kamailio 3.1.x modules list
by Ovidiu Sas 30 Sep '10

30 Sep '10

For the kamailio 3.0.x release, the (s) modules were not included in the binary distribution (the modules.lst did not include modules_s_all). I see that for upcoming kamailio 3.1.x release, while building the modules list by using 'make FLAVOUR=kamailio cfg' the modules_s_all is present in the modules.lst. Is this done on purpose? Do we want to ship the (s) modules with kamailio? Regards, Ovidiu Sas

1 0

git:master: xcap_server: removed WITH_XHTTPAUTH defined
by Daniel-Constantin Mierla 30 Sep '10

30 Sep '10

Module: sip-router Branch: master Commit: a2a98dbbfd14ae6e6e73b40aec55a19f2c718722 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a2a98db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 30 14:58:15 2010 +0200 xcap_server: removed WITH_XHTTPAUTH defined - user authentication is performed always in the sample config --- modules_k/xcap_server/README | 2 -- modules_k/xcap_server/doc/xcap_server_admin.xml | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/modules_k/xcap_server/README b/modules_k/xcap_server/README index 0041177..6c24bd1 100644 --- a/modules_k/xcap_server/README +++ b/modules_k/xcap_server/README @@ -292,13 +292,11 @@ modparam("xcap_server", "db_url", ... event_route[xhttp:request] { -#!ifdef WITH_XHTTPAUTH if (!www_authorize("xcap", "subscriber")) { www_challenge("xcap", "0"); exit; } -#!endif if($hu=~"^/xcap-root/") { set_reply_close(); diff --git a/modules_k/xcap_server/doc/xcap_server_admin.xml b/modules_k/xcap_server/doc/xcap_server_admin.xml index 7d8eef8..3e677df 100644 --- a/modules_k/xcap_server/doc/xcap_server_admin.xml +++ b/modules_k/xcap_server/doc/xcap_server_admin.xml @@ -344,13 +344,11 @@ modparam("xcap_server", "db_url", ... event_route[xhttp:request] { -#!ifdef WITH_XHTTPAUTH if (!www_authorize("xcap", "subscriber")) { www_challenge("xcap", "0"); exit; } -#!endif if($hu=~"^/xcap-root/") { set_reply_close();

1 0

git:master: xcap_server: enhaced sample config in readme
by Daniel-Constantin Mierla 30 Sep '10

30 Sep '10

Module: sip-router Branch: master Commit: a9caef9ac75b946b4e9d0fd0ca81d0625353528c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a9caef9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 30 14:40:26 2010 +0200 xcap_server: enhaced sample config in readme - refresh watchers also for delete (reported by Inaki Baz Castillo) - check if authenticated user matches the user part in xuid, in this way an user is allowed to access and manage only its documents --- modules_k/xcap_server/README | 16 ++++++++++++++++ modules_k/xcap_server/doc/xcap_server_admin.xml | 16 ++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/modules_k/xcap_server/README b/modules_k/xcap_server/README index 681f194..0041177 100644 --- a/modules_k/xcap_server/README +++ b/modules_k/xcap_server/README @@ -338,11 +338,22 @@ event_route[xhttp:request] { "$var(xbody)"); exit; } + # be sure auth user access only its documents + if ($au!=$(var(uri){uri.user})) { + xhttp_reply("403", "Forbidden", "text/html", + "operation not allowed"); + exit; + } xdbg("SCRIPT: xcap service $xcapuri(u=>auid) for $xcapuri(u=>xuid)\n"); switch($rm) { case "PUT": xcaps_put("$var(uri)", "$hu", "$rb"); + if($xcapuri(u=>auid)=~"pres-rules") + { + pres_update_watchers("$var(uri)", "presence"); + pres_refresh_watchers("$var(uri)", "presence", 1); + } exit; break; case "GET": @@ -351,6 +362,11 @@ event_route[xhttp:request] { break; case "DELETE": xcaps_del("$var(uri)", "$hu"); + if($xcapuri(u=>auid)=~"pres-rules") + { + pres_update_watchers("$var(uri)", "presence"); + pres_refresh_watchers("$var(uri)", "presence", 1); + } exit; break; } diff --git a/modules_k/xcap_server/doc/xcap_server_admin.xml b/modules_k/xcap_server/doc/xcap_server_admin.xml index 95ff2a0..7d8eef8 100644 --- a/modules_k/xcap_server/doc/xcap_server_admin.xml +++ b/modules_k/xcap_server/doc/xcap_server_admin.xml @@ -390,11 +390,22 @@ event_route[xhttp:request] { "$var(xbody)"); exit; } + # be sure auth user access only its documents + if ($au!=$(var(uri){uri.user})) { + xhttp_reply("403", "Forbidden", "text/html", + "operation not allowed"); + exit; + } xdbg("SCRIPT: xcap service $xcapuri(u=>auid) for $xcapuri(u=>xuid)\n"); switch($rm) { case "PUT": xcaps_put("$var(uri)", "$hu", "$rb"); + if($xcapuri(u=>auid)=~"pres-rules") + { + pres_update_watchers("$var(uri)", "presence"); + pres_refresh_watchers("$var(uri)", "presence", 1); + } exit; break; case "GET": @@ -403,6 +414,11 @@ event_route[xhttp:request] { break; case "DELETE": xcaps_del("$var(uri)", "$hu"); + if($xcapuri(u=>auid)=~"pres-rules") + { + pres_update_watchers("$var(uri)", "presence"); + pres_refresh_watchers("$var(uri)", "presence", 1); + } exit; break; }

1 0

git:master: xcap_server: reply 404 when document is not found
by Daniel-Constantin Mierla 30 Sep '10

30 Sep '10

Module: sip-router Branch: master Commit: f785388e6541e59b5c35a3710bf8d3a41e88a6fe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f785388… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 30 14:25:29 2010 +0200 xcap_server: reply 404 when document is not found --- modules_k/xcap_server/xcap_server.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules_k/xcap_server/xcap_server.c b/modules_k/xcap_server/xcap_server.c index d37c860..302221c 100644 --- a/modules_k/xcap_server/xcap_server.c +++ b/modules_k/xcap_server/xcap_server.c @@ -401,11 +401,12 @@ error: static str xcaps_str_empty = {"", 0}; static str xcaps_str_ok = {"OK", 2}; static str xcaps_str_srverr = {"Server error", 12}; -static str xcaps_str_nocontent = {"No content", 10}; +static str xcaps_str_notfound = {"Not found", 9}; static str xcaps_str_appxml = {"application/xml", 15}; static str xcaps_str_apprlxml = {"application/resource-lists+xml", 30}; static str xcaps_str_apprsxml = {"application/rls-services+xml", 28}; #if 0 +static str xcaps_str_nocontent = {"No content", 10}; static str xcaps_str_appxcxml = {"application/xcap-caps+xml", 25}; #endif static str xcaps_str_appapxml = {"application/auth-policy+xml", 27}; @@ -790,7 +791,7 @@ static int w_xcaps_get(sip_msg_t* msg, char* puri, char* ppath) ctype, &body); } else { /* doc not found */ - xcaps_send_reply(msg, 200, &xcaps_str_nocontent, &xcaps_str_empty, + xcaps_send_reply(msg, 404, &xcaps_str_notfound, &xcaps_str_empty, &xcaps_str_empty, &xcaps_str_empty); } return 1;

1 0

append_branch() change
by Miklos Tirpak 30 Sep '10

30 Sep '10

hi, I was recently fighting with a serial forking issue, and figured out that t_relay() automatically appends a new branch when the RURI has been changed. This means to me that the config below becomes incorrect: failure_route["abcd"] { ... rewritehostport("127.0.0.1:5062"); append_branch(); t_relay(); } I saw two branches created with the same RURI and sent to the same destination in parallel. As far as I got it append_branch() should not be called any more in failure route unless parallel forking is desired. This is great, the only issue is that this is not mentioned in the documentation, the tm readme file still contains the old examples, and all the configurations under etc/ still call append_branch(). Is there any plan to update the docs and configs before releasing the new sip-router version? Thanks, Miklos

3 4

git:master: core: append_branch(): avoid identical branches
by Andrei Pelinescu-Onciul 30 Sep '10

30 Sep '10

Module: sip-router Branch: master Commit: 4cd7a346ad6dd2542c318ad371416105b60654be URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4cd7a34… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Sep 11 08:24:23 2010 +0200 core: append_branch(): avoid identical branches If append_branch() is used from the script, try to avoid having 2 identical branches (one for the main ruri and one because of the append_branch()). In this case the ruri will be marked as consumed. Reported-by: Daniel-Constantin Mierla <miconda(a)gmail.com> Reported-and-tested-by: Miklos Tirpak <miklos(a)iptel.org> --- action.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/action.c b/action.c index 1716c34..67c6026 100644 --- a/action.c +++ b/action.c @@ -549,6 +549,11 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) 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); + /* if the uri is the ruri and q was also not changed, mark + ruri as consumed, to avoid having an identical branch */ + if ((a->val[0].u.str.s == 0 || a->val[0].u.str.len == 0) && + a->val[1].u.number == Q_UNSPECIFIED) + ruri_mark_consumed(); break; /* jku begin: is_length_greater_than */

1 0

git:master: core: minor append_branch cleanup
by Andrei Pelinescu-Onciul 30 Sep '10

30 Sep '10

Module: sip-router Branch: master Commit: be3c27905011c86069905d1fcbeddaa46f2d06aa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=be3c279… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Sep 11 18:19:44 2010 +0200 core: minor append_branch cleanup The 2 script versions for append_branch without parameters are now equivalent (append_branch and append_branch()). --- cfg.y | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/cfg.y b/cfg.y index d98372d..dee2e2d 100644 --- a/cfg.y +++ b/cfg.y @@ -3130,9 +3130,21 @@ cmd: $$=mk_action(APPEND_BRANCH_T, 2, STRING_ST, $3, NUMBER_ST, (void *)(long)q); set_cfg_pos($$); } - | APPEND_BRANCH LPAREN STRING RPAREN { $$=mk_action(APPEND_BRANCH_T, 2, STRING_ST, $3, NUMBER_ST, (void *)Q_UNSPECIFIED); set_cfg_pos($$); } - | APPEND_BRANCH LPAREN RPAREN { $$=mk_action(APPEND_BRANCH_T, 2, STRING_ST, 0, NUMBER_ST, (void *)Q_UNSPECIFIED); set_cfg_pos($$); } - | APPEND_BRANCH { $$=mk_action( APPEND_BRANCH_T, 1, STRING_ST, 0); set_cfg_pos($$); } + | APPEND_BRANCH LPAREN STRING RPAREN { + $$=mk_action(APPEND_BRANCH_T, 2, STRING_ST, $3, + NUMBER_ST, (void *)Q_UNSPECIFIED); + set_cfg_pos($$); + } + | APPEND_BRANCH LPAREN RPAREN { + $$=mk_action(APPEND_BRANCH_T, 2, STRING_ST, 0, + NUMBER_ST, (void *)Q_UNSPECIFIED); + set_cfg_pos($$); + } + | APPEND_BRANCH { + $$=mk_action(APPEND_BRANCH_T, 2, STRING_ST, 0, + NUMBER_ST, (void *)Q_UNSPECIFIED); + set_cfg_pos($$); + } | SET_HOSTPORT LPAREN STRING RPAREN { $$=mk_action(SET_HOSTPORT_T, 1, STRING_ST, $3); set_cfg_pos($$); } | SET_HOSTPORT error { $$=0; yyerror("missing '(' or ')' ?"); } | SET_HOSTPORT LPAREN error RPAREN { $$=0; yyerror("bad argument, string expected"); }

1 0

git:master: tm: t_save_lumps() verifies the route type
by Miklos Tirpak 30 Sep '10

30 Sep '10

Module: sip-router Branch: master Commit: a7bbaf7cd83b5d044ff8c7fff7b19c7ff392da74 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a7bbaf7… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Thu Sep 30 10:42:57 2010 +0200 tm: t_save_lumps() verifies the route type Even though the t_save_lumps() function is registered only for request route, in some corner case, the function might be called from failure_route. (For example a failure route executes a request route block which calls this function.) This scenario resulted in overwriting the already cloned lump list which is not allowed because of the lockless read, and also resulted in a memory leak. An extra check is also added to save_msg_lumps() to catch this bug. --- modules/tm/sip_msg.c | 8 ++++++++ modules/tm/tm.c | 22 ++++++++++++---------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/modules/tm/sip_msg.c b/modules/tm/sip_msg.c index e7bebcc..ab093f8 100644 --- a/modules/tm/sip_msg.c +++ b/modules/tm/sip_msg.c @@ -116,6 +116,14 @@ int save_msg_lumps( struct sip_msg *shm_msg, struct sip_msg *pkg_msg) return -1; } +#ifdef EXTRA_DEBUG + membar_depends(); + if (shm_msg->add_rm || shm_msg->body_lumps || shm_msg->reply_lump) { + LOG(L_ERR, "ERROR: save_msg_lumps: BUG, trying to overwrite the already cloned lumps\n"); + return -1; + } +#endif + /* needless to clone the lumps for ACK, they will not be used again */ if (shm_msg->REQ_METHOD == METHOD_ACK) return 0; diff --git a/modules/tm/tm.c b/modules/tm/tm.c index c5cd841..e5ca753 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -1885,17 +1885,19 @@ static int w_t_save_lumps(struct sip_msg* msg, char* foo, char* bar) #ifdef POSTPONE_MSG_CLONING struct cell *t; - t=get_t(); - if (!t || t==T_UNDEFINED) { - LOG(L_ERR, "ERROR: w_t_save_lumps: transaction has not been created yet\n"); - return -1; - } + if (is_route_type(REQUEST_ROUTE)) { + t=get_t(); + if (!t || t==T_UNDEFINED) { + LOG(L_ERR, "ERROR: w_t_save_lumps: transaction has not been created yet\n"); + return -1; + } - if (save_msg_lumps(t->uas.request, msg)) { - LOG(L_ERR, "ERROR: w_t_save_lumps: " - "failed to save the message lumps\n"); - return -1; - } + if (save_msg_lumps(t->uas.request, msg)) { + LOG(L_ERR, "ERROR: w_t_save_lumps: " + "failed to save the message lumps\n"); + return -1; + } + } /* else nothing to do, the lumps have already been saved */ return 1; #else LOG(L_ERR, "ERROR: w_t_save_lumps: POSTPONE_MSG_CLONING is not defined,"

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 September 2010