sr-dev February 2010

sr-dev@lists.kamailio.org

31 participants
250 discussions

git:tmp/k3.0_sr_backports: core: exit() is now equivalent to exit 1
by Andrei Pelinescu-Onciul 01 Feb '10

01 Feb '10

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: 9954a52e8fa08a4f729e1b211c16e47aea095883 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9954a52… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 1 12:16:50 2010 +0100 core: exit() is now equivalent to exit 1 exit or exit() no longer drop messages by default. They now end the script with return==1 (instead of 0). Note that exit 0 is equivalent with DROP in non-kamailio mode and in most routes, but this kind of usage is deprecated (use drop instead of exit 0). --- cfg.y | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cfg.y b/cfg.y index 9a71817..4318728 100644 --- a/cfg.y +++ b/cfg.y @@ -3239,7 +3239,8 @@ ret_cmd: (void*)(DROP_R_F|EXIT_R_F)); set_cfg_pos($$); } | EXIT LPAREN RPAREN { - $$=mk_action(DROP_T, 2, NUMBER_ST, 0, NUMBER_ST, (void*)EXIT_R_F); + $$=mk_action(DROP_T, 2, NUMBER_ST, (void*)1, NUMBER_ST, + (void*)EXIT_R_F); set_cfg_pos($$); } | EXIT rval_expr { @@ -3247,7 +3248,8 @@ ret_cmd: set_cfg_pos($$); } | EXIT { - $$=mk_action(DROP_T, 2, NUMBER_ST, 0, NUMBER_ST, (void*)EXIT_R_F); + $$=mk_action(DROP_T, 2, NUMBER_ST, (void*)1, NUMBER_ST, + (void*)EXIT_R_F); set_cfg_pos($$); } | RETURN {

1 0

git:tmp/k3.0_sr_backports: tm: run release function for tmcb parameters
by Andrei Pelinescu-Onciul 01 Feb '10

01 Feb '10

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: 94942cbab5774f60100dbdfec0eb31dec4f2cff2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=94942cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Jan 15 22:09:01 2010 +0100 tm: run release function for tmcb parameters - allow early registration of tm cb (in use by k uac module for example, reported by Vulpyne) - release function calling was missing (cherry picked from commit 68d63835c6ec1a3fa4984aa3eb3fcc081a4f1f86) --- modules/tm/h_table.c | 5 +++- modules/tm/t_hooks.c | 51 +++++++++++++++++++++++++++++++++++++++---------- modules/tm/t_hooks.h | 2 + 3 files changed, 46 insertions(+), 12 deletions(-) diff --git a/modules/tm/h_table.c b/modules/tm/h_table.c index f35d7d5..a7327d9 100644 --- a/modules/tm/h_table.c +++ b/modules/tm/h_table.c @@ -324,8 +324,11 @@ struct cell* build_cell( struct sip_msg* p_msg ) /* enter callback, which may potentially want to parse some stuff, * before the request is shmem-ized */ - if (p_msg && has_reqin_tmcbs()) + if (p_msg) { + set_early_tmcb_list(p_msg, new_cell); + if(has_reqin_tmcbs()) run_reqin_callbacks( new_cell, p_msg, p_msg->REQ_METHOD); + } if (p_msg) { #ifndef POSTPONE_MSG_CLONING diff --git a/modules/tm/t_hooks.c b/modules/tm/t_hooks.c index 259476c..7698517 100644 --- a/modules/tm/t_hooks.c +++ b/modules/tm/t_hooks.c @@ -57,7 +57,36 @@ struct tmcb_head_list* req_in_tmcb_hl = 0; struct tmcb_head_list* local_req_in_tmcb_hl = 0; +struct tm_early_cb { + unsigned int msgid; + struct tmcb_head_list cb_list; +} tmcb_early_hl = { 0, {0, 0} }; +struct tmcb_head_list* get_early_tmcb_list(struct sip_msg *msg) +{ + struct tm_callback *cbp, *cbp_tmp; + if (msg->id!=tmcb_early_hl.msgid) { + for( cbp=(struct tm_callback*)tmcb_early_hl.cb_list.first; cbp ; ) { + cbp_tmp = cbp; + cbp = cbp->next; + if (cbp_tmp->param && cbp_tmp->release) + cbp_tmp->release( cbp_tmp->param ); + shm_free( cbp_tmp ); + } + memset(&tmcb_early_hl.cb_list, 0, sizeof(struct tmcb_head_list)); + tmcb_early_hl.msgid = msg->id; + } + return &tmcb_early_hl.cb_list; +} + +void set_early_tmcb_list(struct sip_msg *msg, struct cell *t) +{ + if (msg->id!=tmcb_early_hl.msgid) { + t->tmcb_hl = tmcb_early_hl.cb_list; + memset(&tmcb_early_hl.cb_list, 0, sizeof(struct tmcb_head_list)); + tmcb_early_hl.msgid = 0; + } +} int init_tmcb_lists() { @@ -95,7 +124,8 @@ void destroy_tmcb_lists() for( cbp=(struct tm_callback*)req_in_tmcb_hl->first; cbp ; ) { cbp_tmp = cbp; cbp = cbp->next; - if (cbp_tmp->param) shm_free( cbp_tmp->param ); + if (cbp_tmp->param && cbp_tmp->release) + cbp_tmp->release( cbp_tmp->param ); shm_free( cbp_tmp ); } shm_free(req_in_tmcb_hl); @@ -105,7 +135,8 @@ void destroy_tmcb_lists() for( cbp=(struct tm_callback*)local_req_in_tmcb_hl->first; cbp ; ) { cbp_tmp = cbp; cbp = cbp->next; - if (cbp_tmp->param) shm_free( cbp_tmp->param ); + if (cbp_tmp->param && cbp_tmp->release) + cbp_tmp->release( cbp_tmp->param ); shm_free( cbp_tmp ); } shm_free(local_req_in_tmcb_hl); @@ -207,17 +238,15 @@ int register_tmcb( struct sip_msg* p_msg, struct cell *t, int types, return E_BUG; } /* look for the transaction */ - if ( t_check(p_msg,0)!=1 ){ - LOG(L_CRIT,"BUG:tm:register_tmcb: no transaction found\n"); - return E_BUG; - } - if ( (t=get_t())==0 ) { - LOG(L_CRIT,"BUG:tm:register_tmcb: transaction found " - "is NULL\n"); - return E_BUG; + t=get_t(); + if ( t!=0 && t!=T_UNDEFINED) { + cb_list = &(t->tmcb_hl); + } else { + cb_list = get_early_tmcb_list(p_msg); } + } else { + cb_list = &(t->tmcb_hl); } - cb_list = &(t->tmcb_hl); } return insert_tmcb( cb_list, types, f, param, rel_func ); diff --git a/modules/tm/t_hooks.h b/modules/tm/t_hooks.h index d593a67..32ebaa3 100644 --- a/modules/tm/t_hooks.h +++ b/modules/tm/t_hooks.h @@ -418,6 +418,8 @@ struct tmcb_head_list { extern struct tmcb_head_list* req_in_tmcb_hl; extern struct tmcb_head_list* local_req_in_tmcb_hl; +void set_early_tmcb_list(struct sip_msg *msg, + struct cell *t); #define has_tran_tmcbs(_T_, _types_) \ ( ((_T_)->tmcb_hl.reg_types)&(_types_) )

1 0

git:tmp/k3.0_sr_backports: core: drop reply ser compatibility
by Andrei Pelinescu-Onciul 01 Feb '10

01 Feb '10

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: ae12edc44eee771fb67101dbbed14a1232950be3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ae12edc… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 1 12:06:08 2010 +0100 core: drop reply ser compatibility - drop reply also if ret==0, not only on DROP (e.g. modules function returning 0). This preserves compatibility with old scripts. - uncomment the onreply_route error handling. It was commented out by the last commit (0621319 core: drop reply in K compatible style). To disable it, define NO_ONREPLY_ROUTE_ERROR. --- receive.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/receive.c b/receive.c index df8f11f..49c7c0b 100644 --- a/receive.c +++ b/receive.c @@ -230,14 +230,14 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) if (onreply_rt.rlist[DEFAULT_RT]){ set_route_type(ONREPLY_ROUTE); ret=run_top_route(onreply_rt.rlist[DEFAULT_RT], msg, &ctx); -#if 0 - if (ret<0){ +#ifndef NO_ONREPLY_ROUTE_ERROR + if (unlikely(ret<0)){ LOG(L_WARN, "WARNING: receive_msg: " "error while trying onreply script\n"); goto error_rpl; }else -#endif - if (ctx.run_flags&DROP_R_F){ +#endif /* NO_ONREPLY_ROUTE_ERROR */ + if (unlikely(ret==0 || (ctx.run_flags&DROP_R_F))){ goto skip_send_reply; /* drop the message, no error */ } } @@ -269,13 +269,13 @@ end: if (skipped) STATS_RX_DROPS; #endif return 0; -#if 0 +#ifndef NO_ONREPLY_ROUTE_ERROR error_rpl: /* execute post reply-script callbacks */ exec_post_script_cb(msg, ONREPLY_CB_TYPE); reset_avps(); goto error02; -#endif +#endif /* NO_ONREPLY_ROUTE_ERROR */ error_req: DBG("receive_msg: error:...\n"); /* execute post request-script callbacks */

1 0

git:tmp/k3.0_sr_backports: core: usage of drop in onsend_route for Kamailio compatibility
by Andrei Pelinescu-Onciul 01 Feb '10

01 Feb '10

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: 5d34bdcd2ae8d9fe7356412d9f0f310ad23066e7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5d34bdc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Dec 24 17:11:58 2009 +0100 core: usage of drop in onsend_route for Kamailio compatibility - in K exit and drop have different behavior in some cases - fr onsend_route exit means stop executing the actions and drop does in addition discard sending the message (cherry picked from commit 8a43c6fcb21ff7aeb097b1d8791bfc3d8f020bcb) --- onsend.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/onsend.h b/onsend.h index deec874..eb5569b 100644 --- a/onsend.h +++ b/onsend.h @@ -40,6 +40,7 @@ #include "action.h" #include "route.h" #include "script_cb.h" +#include "sr_compat.h" struct onsend_info{ union sockaddr_union* to; @@ -89,6 +90,10 @@ static inline int run_onsend(struct sip_msg* orig_msg, struct dest_info* dst, orig_msg->fwd_send_flags=fwd_snd_flags_bak; orig_msg->rpl_send_flags=rpl_snd_flags_bak; exec_post_script_cb(orig_msg, ONSEND_CB_TYPE); + if((sr_cfg_compat==SR_COMPAT_KAMAILIO) + && (ret==0) && !(ra_ctx.run_flags&DROP_R_F)){ + ret = 1; + } } else { ret=0; /* drop the message */ }

1 0

git:tmp/k3.0_sr_backports: tm: t_on_xyz("0") fixup updates
by Andrei Pelinescu-Onciul 01 Feb '10

01 Feb '10

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: 9ec0cfc8a2cae52c4bed6e0f777f220840ba30c7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9ec0cfc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Jan 15 20:29:46 2010 +0100 tm: t_on_xyz("0") fixup updates - if parameter of t_on_reply, t_on_failure, t_on_branch is 0 do not call fix_routes and set the parameter value to 0 - resets previous calls of the function with non-zero value and does not print warning message at startup because the route is not found (cherry picked from commit 53d7cb1dae02e4709a10f869e8ec748df73bec37) --- modules/tm/tm.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 767b36e..cef4463 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -542,6 +542,11 @@ static int fixup_t_reply(void** param, int param_no) static int fixup_on_failure(void** param, int param_no) { if (param_no==1){ + if(strlen((char*)*param)<=1 + && (*(char*)(*param)==0 || *(char*)(*param)=='0')) { + *param = (void*)0; + return 0; + } return fixup_routes("t_on_failure", &failure_rt, param); } return 0; @@ -552,6 +557,11 @@ static int fixup_on_failure(void** param, int param_no) static int fixup_on_reply(void** param, int param_no) { if (param_no==1){ + if(strlen((char*)*param)<=1 + && (*(char*)(*param)==0 || *(char*)(*param)=='0')) { + *param = (void*)0; + return 0; + } return fixup_routes("t_on_reply", &onreply_rt, param); } return 0; @@ -562,6 +572,11 @@ static int fixup_on_reply(void** param, int param_no) static int fixup_on_branch(void** param, int param_no) { if (param_no==1){ + if(strlen((char*)*param)<=1 + && (*(char*)(*param)==0 || *(char*)(*param)=='0')) { + *param = (void*)0; + return 0; + } return fixup_routes("t_on_branch", &branch_rt, param); } return 0;

1 0

git:tmp/k3.0_sr_backports: core: drop reply in K compatible style
by Andrei Pelinescu-Onciul 01 Feb '10

01 Feb '10

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: 05589c01cfe7665439f1b6f1c53c27d12e1900e0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=05589c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 29 11:28:20 2009 +0100 core: drop reply in K compatible style - drop reply in default onreply_route when using 'drop' --- receive.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/receive.c b/receive.c index 579a6c2..df8f11f 100644 --- a/receive.c +++ b/receive.c @@ -91,6 +91,7 @@ unsigned int inc_msg_no(void) int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) { struct sip_msg* msg; + struct run_act_ctx ctx; int ret; #ifdef STATS int skipped = 1; @@ -228,13 +229,17 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) /* exec the onreply routing script */ if (onreply_rt.rlist[DEFAULT_RT]){ set_route_type(ONREPLY_ROUTE); - ret=run_top_route(onreply_rt.rlist[DEFAULT_RT], msg, 0); + ret=run_top_route(onreply_rt.rlist[DEFAULT_RT], msg, &ctx); +#if 0 if (ret<0){ LOG(L_WARN, "WARNING: receive_msg: " "error while trying onreply script\n"); goto error_rpl; - }else if (ret==0) goto skip_send_reply; /* drop the message, - no error */ + }else +#endif + if (ctx.run_flags&DROP_R_F){ + goto skip_send_reply; /* drop the message, no error */ + } } /* send the msg */ forward_reply(msg); @@ -264,11 +269,13 @@ end: if (skipped) STATS_RX_DROPS; #endif return 0; +#if 0 error_rpl: /* execute post reply-script callbacks */ exec_post_script_cb(msg, ONREPLY_CB_TYPE); reset_avps(); goto error02; +#endif error_req: DBG("receive_msg: error:...\n"); /* execute post request-script callbacks */

1 0

git:tmp/k3.0_sr_backports: sanity: fix include file due to previous re-location
by Andrei Pelinescu-Onciul 01 Feb '10

01 Feb '10

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: 1c65a90d9a1c9edd9cdf0cd9027361ca20769094 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c65a90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Oct 28 23:38:07 2009 +0100 sanity: fix include file due to previous re-location (cherry picked from commit f771b05fe8f24bebe18962c4169176e47e099ef8) --- modules/sanity/mod_sanity.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/sanity/mod_sanity.h b/modules/sanity/mod_sanity.h index 51a80d4..0b76b75 100644 --- a/modules/sanity/mod_sanity.h +++ b/modules/sanity/mod_sanity.h @@ -32,7 +32,7 @@ #define MOD_SANITY_CHK_H #include "../../str.h" -#include "../sl/sl.h" +#include "../../modules_s/sl/sl.h" #include "../../parser/msg_parser.h" #define SANITY_RURI_SIP_VERSION (1<<0)

1 0

git:tmp/k3.0_sr_backports: sanity: moved module from modules_s to modules
by Andrei Pelinescu-Onciul 01 Feb '10

01 Feb '10

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: d7443727239f5ea2fc8007625808260caa6d1f6b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d744372… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Oct 28 23:07:45 2009 +0100 sanity: moved module from modules_s to modules - modules_k/sanity removed (it was an adapted version for k 1.5) (cherry picked from commit 011cc3ffacfbc6faf65a879d3558cd789f101237) --- {modules_s => modules}/sanity/Makefile | 0 {modules_s => modules}/sanity/README | 0 {modules_s => modules}/sanity/doc/Makefile | 0 {modules_s => modules}/sanity/doc/functions.xml | 0 {modules_s => modules}/sanity/doc/params.xml | 0 {modules_s => modules}/sanity/doc/sanity.xml | 0 {modules_s => modules}/sanity/mod_sanity.c | 0 {modules_s => modules}/sanity/mod_sanity.h | 0 {modules_s => modules}/sanity/sanity.c | 0 {modules_s => modules}/sanity/sanity.h | 0 modules_k/sanity/Makefile | 16 - modules_k/sanity/README | 196 ------ modules_k/sanity/doc/Makefile | 4 - modules_k/sanity/doc/sanity.xml | 41 -- modules_k/sanity/doc/sanity_admin.xml | 271 -------- modules_k/sanity/mod_sanity.c | 221 ------- modules_k/sanity/mod_sanity.h | 85 --- modules_k/sanity/sanity.c | 749 ----------------------- modules_k/sanity/sanity.h | 79 --- 19 files changed, 0 insertions(+), 1662 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=d74…

1 0

xlog enhancements
by Elena-Ramona Modroiu 01 Feb '10

01 Feb '10

Hi, I added two new functions to xlog (modules_k): - xlogl(level, message) - xdbgl(message) They are similar to the existing functions, in addition they print the config line at the beginning of the message. The printed value is: "cfglineno:message" In this way you can spot easily in the logs where the function was used to print a particular message. http://sip-router.org/docbook/sip-router/branch/master/modules_k/xlog/xlog.… Regards, Ramona

1 0

git:kamailio_3.0: tm: fix setting the pre-T callbacks
by Daniel-Constantin Mierla 01 Feb '10

01 Feb '10

Module: sip-router Branch: kamailio_3.0 Commit: 32d3e9c98943ad298f09d26db83ecf4ce5c2cc0e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=32d3e9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 1 11:27:20 2010 +0100 tm: fix setting the pre-T callbacks - introduced in the fix for uac module (affecting only uac) - credits to Andrei Pelinescu-Onciul --- modules/tm/t_hooks.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_hooks.c b/modules/tm/t_hooks.c index e632757..8dc77b1 100644 --- a/modules/tm/t_hooks.c +++ b/modules/tm/t_hooks.c @@ -81,7 +81,7 @@ struct tmcb_head_list* get_early_tmcb_list(struct sip_msg *msg) void set_early_tmcb_list(struct sip_msg *msg, struct cell *t) { - if (msg->id!=tmcb_early_hl.msgid) { + if (msg->id==tmcb_early_hl.msgid) { t->tmcb_hl = tmcb_early_hl.cb_list; memset(&tmcb_early_hl.cb_list, 0, sizeof(struct tmcb_head_list)); tmcb_early_hl.msgid = 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 February 2010