sr-dev

sr-dev@lists.kamailio.org

13 participants
45279 discussions

some tm cleanup
by Daniel-Constantin Mierla 17 Apr '10

17 Apr '10

Hello, load_tm() function uses a mixture of find_export and direct assignment to export the API for TM. I would like to update to the last one, since will cleanup the module exports structure and avoid casting problems when functions prototypes change. Then I see that tm uses some defines for the names of the several functions exported to config, e.g., T_FORWARD_NONACK, ..., which will have no other usage, I would go for using directly the names in module exports - makes life easier when browsing the code and will become coherent. Anyone against? Thanks, Daniel -- Daniel-Constantin Mierla

2 4

wiki: upgrade from 3.0.x to 3.1.x
by Daniel-Constantin Mierla 17 Apr '10

17 Apr '10

Hello, I started the page that should collect notes about how to upgrade from version 3.0.x to 3.1.0: http://sip-router.org/wiki/install/3.0.x-to-3.1.x 3.1.0 is not yet released, target date is September 2010, right now is the code on master branch in GIT repository. However, this page will help people that want to test it or use some modules from it, making as well the life easier before release. Please add to the document as you change (or discover) something breaking compatibility with 3.0.x - the wiki is open. Thanks, Daniel -- Daniel-Constantin Mierla * http://www.asipto.com/ * http://twitter.com/miconda * http://www.linkedin.com/in/danielconstantinmierla

1 0

git:master: core: fixup updates for cfg compat mode removal
by Daniel-Constantin Mierla 17 Apr '10

17 Apr '10

Module: sip-router Branch: master Commit: 8d53f26b931ef7836c31f178021a039b09f04d2c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8d53f26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 17 13:59:30 2010 +0200 core: fixup updates for cfg compat mode removal - default compat mode becomes the only mode - affected is #!SER if anyone was using it - now means that a script variable like $xyz is attepted to be resolved first as PV and if not found the is checked as AVP --- sr_module.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sr_module.c b/sr_module.c index b0c6c20..dabbda9 100644 --- a/sr_module.c +++ b/sr_module.c @@ -1275,12 +1275,11 @@ int fix_param_types(int types, void** param) int fixup_var_str_12(void** param, int param_no) { int ret; - if ((sr_cfg_compat!=SR_COMPAT_SER) && - ((ret = fix_param(FPARAM_PVS, param)) <= 0)) return ret; + if ((ret = fix_param(FPARAM_PVS, param)) <= 0) return ret; if ((ret = fix_param(FPARAM_AVP, param)) <= 0) return ret; if ((ret = fix_param(FPARAM_SELECT, param)) <= 0) return ret; if ((ret = fix_param(FPARAM_STR, param)) <= 0) return ret; - ERR("Error while fixing parameter, AVP, SELECT, and str conversions" + ERR("Error while fixing parameter, PV, AVP, SELECT, and str conversions" " failed\n"); return -1; } @@ -1312,12 +1311,11 @@ int fixup_var_str_2(void** param, int param_no) int fixup_var_int_12(void** param, int param_no) { int ret; - if ((sr_cfg_compat!=SR_COMPAT_SER) && - ((ret = fix_param(FPARAM_PVS, param)) <= 0)) return ret; + if ((ret = fix_param(FPARAM_PVS, param)) <= 0) return ret; if ((ret = fix_param(FPARAM_AVP, param)) <= 0) return ret; if ((ret = fix_param(FPARAM_SELECT, param)) <= 0) return ret; if ((ret = fix_param(FPARAM_INT, param)) <= 0) return ret; - ERR("Error while fixing parameter, AVP, SELECT, and int conversions" + ERR("Error while fixing parameter, PV, AVP, SELECT, and int conversions" " failed\n"); return -1; }

1 0

git:master: tm: removed commented code
by Daniel-Constantin Mierla 17 Apr '10

17 Apr '10

Module: sip-router Branch: master Commit: a734fd7cb6f0755fa44e6bed51e41247a846c63d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a734fd7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 17 12:41:00 2010 +0200 tm: removed commented code - related to timeout avp and K cfg compat mode --- modules/tm/t_funcs.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/modules/tm/t_funcs.c b/modules/tm/t_funcs.c index 0f935c3..92a68da 100644 --- a/modules/tm/t_funcs.c +++ b/modules/tm/t_funcs.c @@ -517,16 +517,6 @@ static inline int avp2timer(unsigned int* timer, int type, int_str name) } else { *timer = val_istr.n; } -#if 0 - /* value of AVP is expected to be sec, not milisec lile mod params */ - if(sr_cfg_compat==SR_COMPAT_KAMAILIO) { - if(*timer>0 && *timer<=120) { - LM_WARN("too small given timer value: %ums (using T*1000)\n", - *timer); - *timer *= 1000; - } - } -#endif return *timer==0; /* 1 if 0 (use default), 0 if !=0 (use *timer) */ }

1 0

git:master: tm: branch selection for failure_route controlled by param
by Daniel-Constantin Mierla 17 Apr '10

17 Apr '10

Module: sip-router Branch: master Commit: 7f0cdd239d24bc5a81aa4d9ca679eb29cd3e4ffe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7f0cdd2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 17 13:06:13 2010 +0200 tm: branch selection for failure_route controlled by param - replaced cfg compat mode controlling of branch reply selection for failure_ route with a parameter: failure_reply_mode - default value: 0 - keep all branches, use t_drop_replies() for controlling per transaction in failure_route (default behavior of ser 2.1.x) 1 - drop all branches 2 - drop branches of last serial forking step 3 - automatically drop old branches when a new serial forking step is initiated (default kamailio 1.5.x behaviour) --- modules/tm/t_reply.c | 15 +++++++++++---- modules/tm/t_reply.h | 2 ++ modules/tm/tm.c | 1 + 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 4415294..9ad1d0e 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -174,6 +174,16 @@ static int goto_on_reply=0; /* where to go on receipt of reply without transaction context */ int goto_on_sl_reply=0; +/* how to deal with winning branch reply selection in failure_route + * can be overwritten per transaction with t_drop_replies(...) + * Values: + * - 0 - all branches are kept (default, and default ser 2.1.x behaviour) + * - 1 - all branches are discarded + * - 2 - braches of last step of serial forking are discarded + * - 3 - all branches are discarded if a new leg of serial forking + * is started (default kamailio 1.5.x behaviour) + */ +int failure_reply_mode = 0; /* responses priority (used by t_pick_branch) * 0xx is used only for the initial value (=> should have no chance to be @@ -1158,10 +1168,7 @@ static enum rps t_should_relay_response( struct cell *Trans , int new_code, Trans->flags&=~T_6xx; /* clear the 6xx flag , we want to allow new branches from the failure route */ - if(sr_cfg_compat==SR_COMPAT_KAMAILIO) - drop_replies = 3; - else - drop_replies = 0; + drop_replies = failure_reply_mode; replies_dropped = 0; /* run ON_FAILURE handlers ( route and callbacks) */ if (unlikely(has_tran_tmcbs( Trans, TMCB_ON_FAILURE_RO|TMCB_ON_FAILURE) diff --git a/modules/tm/t_reply.h b/modules/tm/t_reply.h index 7ea9dc8..b798fa1 100644 --- a/modules/tm/t_reply.h +++ b/modules/tm/t_reply.h @@ -58,6 +58,8 @@ extern char *tm_tag_suffix; extern int goto_on_sl_reply; +extern int failure_reply_mode; + /* has this to-tag been never seen in previous 200/INVs? */ int unmatched_totag(struct cell *t, struct sip_msg *ack); diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 34a9e9f..28687e6 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -535,6 +535,7 @@ static param_export_t params[]={ {"contacts_avp", PARAM_STRING, &contacts_avp_param }, {"disable_6xx_block", PARAM_INT, &default_tm_cfg.disable_6xx }, {"local_ack_mode", PARAM_INT, &default_tm_cfg.local_ack_mode }, + {"failure_reply_mode", PARAM_INT, &failure_reply_mode }, {0,0,0} };

1 0

git:master: tm: removed auto-adjustment of timers for K compat mode
by Daniel-Constantin Mierla 17 Apr '10

17 Apr '10

Module: sip-router Branch: master Commit: 8633741eb9163864f14f97582c1cddd4ca67bc69 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8633741… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 17 12:36:39 2010 +0200 tm: removed auto-adjustment of timers for K compat mode - K compat mode removed for auto-adjustment of values for timer parameters - make sure you give proper value in mili-seconds (as in README) - part of cfg compat mode removal --- modules/tm/timer.c | 23 ----------------------- 1 files changed, 0 insertions(+), 23 deletions(-) diff --git a/modules/tm/timer.c b/modules/tm/timer.c index 534fdd3..4cb744c 100644 --- a/modules/tm/timer.c +++ b/modules/tm/timer.c @@ -174,29 +174,6 @@ struct msgid_var user_noninv_max_lifetime; /* fix timer values to ticks */ int tm_init_timers() { - if(sr_cfg_compat==SR_COMPAT_KAMAILIO) { - if(default_tm_cfg.fr_timeout<=120) { - LM_WARN("too small given fr_timer value: %ums (using T*1000)\n", - default_tm_cfg.fr_timeout); - default_tm_cfg.fr_timeout *= 1000; - } - if(default_tm_cfg.fr_inv_timeout<=120) { - LM_WARN("too small given fr_inv_timer value: %ums (using T*1000)\n", - default_tm_cfg.fr_inv_timeout); - default_tm_cfg.fr_inv_timeout *= 1000; - } - if(default_tm_cfg.wait_timeout<=120) { - LM_WARN("too small given wait_timer value: %ums (using T*1000)\n", - default_tm_cfg.wait_timeout); - default_tm_cfg.wait_timeout *= 1000; - } - if(default_tm_cfg.delete_timeout<=120) { - LM_WARN("too small given delete_timer value: %ums (using T*1000)\n", - default_tm_cfg.delete_timeout); - default_tm_cfg.delete_timeout *= 1000; - } - } - default_tm_cfg.fr_timeout=MS_TO_TICKS(default_tm_cfg.fr_timeout); default_tm_cfg.fr_inv_timeout=MS_TO_TICKS(default_tm_cfg.fr_inv_timeout); default_tm_cfg.wait_timeout=MS_TO_TICKS(default_tm_cfg.wait_timeout);

1 0

git:master: kamailio.cfg: added some tm parameters
by Daniel-Constantin Mierla 17 Apr '10

17 Apr '10

Module: sip-router Branch: master Commit: cba4663bb425952c22084f3ba2192250430eae5a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cba4663… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 17 13:34:50 2010 +0200 kamailio.cfg: added some tm parameters - failure_reply_mode set to 3 - kamailio 1.5.x default behavior - added fr_timer and fr_inv_timer with their default values to show they take now milisecond values --- etc/kamailio.cfg | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 1269860..c70c767 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -178,6 +178,14 @@ loadmodule "nathelper.so" modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") +# ----- tm params ----- +# auto-discard branches from previous serial forking leg +modparam("tm", "failure_reply_mode", 3) +# default retransmission timeout: 30sec +modparam("tm", "fr_timer", 30000) +# default invite retransmission timeout after 1xx: 120sec +modparam("tm", "fr_inv_timer", 120000) + # ----- rr params ----- # add value to ;lr param to cope with most of the UAs modparam("rr", "enable_full_lr", 1)

1 0

git:master: tm: documented failure_reply_mode
by Daniel-Constantin Mierla 17 Apr '10

17 Apr '10

Module: sip-router Branch: master Commit: 1a33a975c0350055f0018c6d2313b630e8234c1b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1a33a97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 17 13:27:29 2010 +0200 tm: documented failure_reply_mode - control how branches are managed for serial forking, i.e., failure_route handling --- modules/tm/README | 196 +++++++++++++++++++++++++++------------------ modules/tm/doc/params.xml | 54 ++++++++++++ 2 files changed, 171 insertions(+), 79 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=1a3…

1 0

[tracker] Task opened: t_relay() failure codes should be documented in tm module README
by sip-router 17 Apr '10

17 Apr '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Juha Heinanen (jh) Attached to Project - sip-router Summary - t_relay() failure codes should be documented in tm module README Task Type - Improvement Category - tm Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - t_relay() failure codes should be documented in tm module README. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=67 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Assignee added: t_relay() failure codes should be documented in tm module README
by sip-router 17 Apr '10

17 Apr '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#67 - t_relay() failure codes should be documented in tm module README User who did this - Juha Heinanen (jh) http://sip-router.org/tracker/index.php?do=details&task_id=67 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

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