sr-dev

sr-dev@lists.kamailio.org

15 participants
44264 discussions

git:kamailio_3.0: core: kamailio mode config parser fix

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: dc2361c509d71d30d82ce6f268f3fd6b3fa28b44 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dc2361c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Nov 2 15:35:42 2009 +0100 core: kamailio mode config parser fix - fixed bug in parsing pvars without (), when in #!KAMAILIO mode Reported-by: Daniel-Constantin Mierla <miconda(a)gmail.com> --- cfg.lex | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/cfg.lex b/cfg.lex index c9f09fc..e63cebf 100644 --- a/cfg.lex +++ b/cfg.lex @@ -104,6 +104,7 @@ #define SELECT_S 5 #define AVP_PVAR_S 6 /* avp or pvar */ #define PVAR_P_S 7 /* pvar: $(...) or $foo(...)*/ + #define PVARID_S 8 /* $foo.bar...*/ #define STR_BETWEEN_S 9 #define LINECOMMENT_S 10 #define DEFINE_S 11 @@ -169,7 +170,7 @@ /* start conditions */ %x STRING1 STRING2 STR_BETWEEN COMMENT COMMENT_LN ATTR SELECT AVP_PVAR PVAR_P -%x INCLF +%x PVARID INCLF %x LINECOMMENT DEFINE_ID DEFINE_EOL IFDEF_ID IFDEF_EOL IFDEF_SKIP /* config script types : #!SER or #!KAMAILIO or #!MAX_COMPAT */ @@ -982,6 +983,19 @@ EAT_ABLE [\ \t\b\r] <PVAR_P>{LPAREN} { p_nest++; yymore(); } <PVAR_P>. { yymore(); } +<PVARID>{ID}|'\.' {yymore(); } +<PVARID>{LPAREN} { state = PVAR_P_S; BEGIN(PVAR_P); + p_nest=1; yymore(); } +<PVARID>. { yyless(yyleng-1); + count(); + addstr(&s_buf, yytext, yyleng); + yylval.strval=s_buf.s; + memset(&s_buf, 0, sizeof(s_buf)); + state=INITIAL_S; + BEGIN(INITIAL); + return PVAR; + } + /* if found retcode => it's a built-in pvar */ <INITIAL>{RETCODE} { count(); yylval.strval=yytext; return PVAR; } @@ -993,6 +1007,9 @@ EAT_ABLE [\ \t\b\r] return ATTR_MARK; break; case SR_COMPAT_KAMAILIO: + state=PVARID_S; BEGIN(PVARID); + yymore(); + break; case SR_COMPAT_MAX: default: state=AVP_PVAR_S; BEGIN(AVP_PVAR); @@ -1215,6 +1232,8 @@ EAT_ABLE [\ \t\b\r] " while parsing" " avp name\n"); break; + case PVARID_S: + p_nest=0; case PVAR_P_S: LOG(L_CRIT, "ERROR: unexpected EOF" " while parsing pvar name"

15 years, 2 months

git:sr_3.0: core: kamailio mode config parser fix

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 796ee85ed4da89886a676133e97c127ee8fb129f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=796ee85… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Nov 2 15:35:42 2009 +0100 core: kamailio mode config parser fix - fixed bug in parsing pvars without (), when in #!KAMAILIO mode Reported-by: Daniel-Constantin Mierla <miconda(a)gmail.com> --- cfg.lex | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cfg.lex b/cfg.lex index 105df4b..61e694e 100644 --- a/cfg.lex +++ b/cfg.lex @@ -962,10 +962,16 @@ EAT_ABLE [\ \t\b\r] <PVAR_P>{LPAREN} { p_nest++; yymore(); } <PVAR_P>. { yymore(); } -<PVARID>{ID}|'.' {yymore(); } +<PVARID>{ID}|'\.' {yymore(); } <PVARID>{LPAREN} { state = PVAR_P_S; BEGIN(PVAR_P); p_nest=1; yymore(); } -<PVARID>. { yyless(0); state=INITIAL_S; BEGIN(INITIAL); +<PVARID>. { yyless(yyleng-1); + count(); + addstr(&s_buf, yytext, yyleng); + yylval.strval=s_buf.s; + memset(&s_buf, 0, sizeof(s_buf)); + state=INITIAL_S; + BEGIN(INITIAL); return PVAR; }

15 years, 2 months

git:kamailio_3.0: tm: auto-correct timeout values in K compat mode

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 2a34921ba091b10c201f330aa2f7bea336708231 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2a34921… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Nov 2 15:16:16 2009 +0100 tm: auto-correct timeout values in K compat mode - if the value of timer parameters is less than 120 then use T*1000 - SR TM use mili-seconds instead of seconds like in K 1.5 - print warning message if such case happens --- modules/tm/t_funcs.c | 7 +++++++ modules/tm/timer.c | 26 +++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_funcs.c b/modules/tm/t_funcs.c index 8b8a53a..988e22b 100644 --- a/modules/tm/t_funcs.c +++ b/modules/tm/t_funcs.c @@ -518,6 +518,13 @@ static inline int avp2timer(unsigned int* timer, int type, int_str name) *timer = val_istr.n; } + 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; + } + } return *timer==0; /* 1 if 0 (use default), 0 if !=0 (use *timer) */ } diff --git a/modules/tm/timer.c b/modules/tm/timer.c index 9c38274..ce9b7cd 100644 --- a/modules/tm/timer.c +++ b/modules/tm/timer.c @@ -131,7 +131,8 @@ #include "../../parser/parser_f.h" #include "../../ut.h" #include "../../timer_ticks.h" -#include "../../compiler_opt.h" +#include "../../compiler_opt.h" +#include "../../sr_compat.h" #include "t_funcs.h" #include "t_reply.h" #include "t_cancel.h" @@ -173,6 +174,29 @@ 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);

15 years, 2 months

git:kamailio_3.0: tm: avp style for parameters

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: ed9c6128fdd588f5d9aa19ad666db36cfc0c788d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ed9c612… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Nov 2 14:46:17 2009 +0100 tm: avp style for parameters - when K config compatibility is defined, TM avp parameters use the $avp(name) format. e.g.: ... modparam("tm", "fr_timer_avp", "$avp(i:10)") --- modules/tm/t_funcs.c | 84 +++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 69 insertions(+), 15 deletions(-) diff --git a/modules/tm/t_funcs.c b/modules/tm/t_funcs.c index 51407f7..8b8a53a 100644 --- a/modules/tm/t_funcs.c +++ b/modules/tm/t_funcs.c @@ -63,6 +63,8 @@ #include "../../hash_func.h" #include "../../dset.h" #include "../../mem/mem.h" +#include "../../sr_compat.h" +#include "../../pvar.h" #include "defs.h" #include "t_funcs.h" #include "t_fwd.h" @@ -399,36 +401,88 @@ done: int init_avp_params(char *fr_timer_param, char *fr_inv_timer_param, char* contacts_avp_param) { + pv_spec_t avp_spec; + if (fr_timer_param && *fr_timer_param) { fr_timer_str.s = fr_timer_param; fr_timer_str.len = strlen(fr_timer_str.s); - if (parse_avp_spec( &fr_timer_str, &fr_timer_avp_type, - &fr_timer_avp, &fr_timer_index)<0) { - LOG(L_CRIT,"ERROR:tm:init_avp_params: invalid fr_timer " - "AVP specs \"%s\"\n", fr_timer_param); - return -1; + + if(sr_cfg_compat==SR_COMPAT_KAMAILIO) { + if (pv_parse_spec(&fr_timer_str, &avp_spec)==0 + || avp_spec.type!=PVT_AVP) { + LM_ERR("malformed or non AVP %s AVP definition\n", + fr_timer_param); + return -1; + } + + if(pv_get_avp_name(0, &avp_spec.pvp, &fr_timer_avp, + (unsigned short*)&fr_timer_avp_type)!=0) + { + LM_ERR("[%s]- invalid AVP definition\n", fr_timer_param); + return -1; + } + } else { + if (parse_avp_spec( &fr_timer_str, &fr_timer_avp_type, + &fr_timer_avp, &fr_timer_index)<0) { + LOG(L_CRIT,"ERROR:tm:init_avp_params: invalid fr_timer " + "AVP specs \"%s\"\n", fr_timer_param); + return -1; + } } } if (fr_inv_timer_param && *fr_inv_timer_param) { fr_inv_timer_str.s = fr_inv_timer_param; fr_inv_timer_str.len = strlen(fr_inv_timer_str.s); - if (parse_avp_spec( &fr_inv_timer_str, &fr_inv_timer_avp_type, - &fr_inv_timer_avp, &fr_inv_timer_index)<0) { - LOG(L_CRIT,"ERROR:tm:init_avp_params: invalid fr_inv_timer " - "AVP specs \"%s\"\n", fr_inv_timer_param); - return -1; + + if(sr_cfg_compat==SR_COMPAT_KAMAILIO) { + if (pv_parse_spec(&fr_inv_timer_str, &avp_spec)==0 + || avp_spec.type!=PVT_AVP) { + LM_ERR("malformed or non AVP %s AVP definition\n", + fr_inv_timer_param); + return -1; + } + + if(pv_get_avp_name(0, &avp_spec.pvp, &fr_inv_timer_avp, + (unsigned short*)&fr_inv_timer_avp_type)!=0) + { + LM_ERR("[%s]- invalid AVP definition\n", fr_inv_timer_param); + return -1; + } + } else { + if (parse_avp_spec( &fr_inv_timer_str, &fr_inv_timer_avp_type, + &fr_inv_timer_avp, &fr_inv_timer_index)<0) { + LOG(L_CRIT,"ERROR:tm:init_avp_params: invalid fr_inv_timer " + "AVP specs \"%s\"\n", fr_inv_timer_param); + return -1; + } } } if (contacts_avp_param && *contacts_avp_param) { contacts_avp_str.s = contacts_avp_param; contacts_avp_str.len = strlen(contacts_avp_str.s); - if (parse_avp_spec( &contacts_avp_str, &contacts_avp_type, - &contacts_avp, &contacts_avp_index)<0) { - LOG(L_CRIT,"ERROR:tm:init_avp_params: invalid contact_avp_params " - "AVP specs \"%s\"\n", contacts_avp_param); - return -1; + + if(sr_cfg_compat==SR_COMPAT_KAMAILIO) { + if ((pv_parse_spec(&contacts_avp_str, &avp_spec) == 0) + || (avp_spec.type != PVT_AVP)) { + LM_ERR("malformed or non AVP definition <%s>\n", + contacts_avp_param); + return -1; + } + + if(pv_get_avp_name(0, &(avp_spec.pvp), &contacts_avp, + (unsigned short*)&contacts_avp_type) != 0) { + LM_ERR("invalid AVP definition <%s>\n", contacts_avp_param); + return -1; + } + } else { + if (parse_avp_spec( &contacts_avp_str, &contacts_avp_type, + &contacts_avp, &contacts_avp_index)<0) { + LOG(L_CRIT,"ERROR:tm:init_avp_params: invalid contact_avp_params " + "AVP specs \"%s\"\n", contacts_avp_param); + return -1; + } } }

15 years, 2 months

git:kamailio_3.0: define kamailio compatibility mode

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 36c4036bbfa26f34be8c434d94b17e75bb6b2bef URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=36c4036… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Nov 2 14:49:06 2009 +0100 define kamailio compatibility mode - #!KAMAILIO at the top of config file --- etc/kamailio.cfg | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 2844581..dc73c20 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -1,3 +1,4 @@ +#!KAMAILIO # # $Id$ #

15 years, 2 months

git:kamailio_3.0: cfg parser update for KAMAILIO compat mode

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: e494c2c2dbc750f2646f626bed95907ee91db8af URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e494c2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Nov 2 15:18:29 2009 +0100 cfg parser update for KAMAILIO compat mode - now is same behaviour as for MAX compat mode --- cfg.lex | 15 +-------------- 1 files changed, 1 insertions(+), 14 deletions(-) diff --git a/cfg.lex b/cfg.lex index 38bc6db..c9f09fc 100644 --- a/cfg.lex +++ b/cfg.lex @@ -104,7 +104,6 @@ #define SELECT_S 5 #define AVP_PVAR_S 6 /* avp or pvar */ #define PVAR_P_S 7 /* pvar: $(...) or $foo(...)*/ - #define PVARID_S 8 /* $foo.bar...*/ #define STR_BETWEEN_S 9 #define LINECOMMENT_S 10 #define DEFINE_S 11 @@ -170,7 +169,7 @@ /* start conditions */ %x STRING1 STRING2 STR_BETWEEN COMMENT COMMENT_LN ATTR SELECT AVP_PVAR PVAR_P -%x PVARID INCLF +%x INCLF %x LINECOMMENT DEFINE_ID DEFINE_EOL IFDEF_ID IFDEF_EOL IFDEF_SKIP /* config script types : #!SER or #!KAMAILIO or #!MAX_COMPAT */ @@ -983,13 +982,6 @@ EAT_ABLE [\ \t\b\r] <PVAR_P>{LPAREN} { p_nest++; yymore(); } <PVAR_P>. { yymore(); } -<PVARID>{ID}|'.' {yymore(); } -<PVARID>{LPAREN} { state = PVAR_P_S; BEGIN(PVAR_P); - p_nest=1; yymore(); } -<PVARID>. { yyless(0); state=INITIAL_S; BEGIN(INITIAL); - return PVAR; - } - /* if found retcode => it's a built-in pvar */ <INITIAL>{RETCODE} { count(); yylval.strval=yytext; return PVAR; } @@ -1001,9 +993,6 @@ EAT_ABLE [\ \t\b\r] return ATTR_MARK; break; case SR_COMPAT_KAMAILIO: - state=PVARID_S; BEGIN(PVARID); - yymore(); - break; case SR_COMPAT_MAX: default: state=AVP_PVAR_S; BEGIN(AVP_PVAR); @@ -1226,8 +1215,6 @@ EAT_ABLE [\ \t\b\r] " while parsing" " avp name\n"); break; - case PVARID_S: - p_nest=0; case PVAR_P_S: LOG(L_CRIT, "ERROR: unexpected EOF" " while parsing pvar name"

15 years, 2 months

git:master: tm: Number of fixes in code and documentation for serial forking.

by Jan Janak

Module: sip-router Branch: master Commit: ed3902e9bd5a3af6ee5d5df08ce2564f028a0f24 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ed3902e… Author: Jan Janak <jan(a)ryngle.com> Committer: Jan Janak <jan(a)ryngle.com> Date: Sun Oct 18 00:39:31 2009 +0200 tm: Number of fixes in code and documentation for serial forking. This patch improves the serial forking related code and documentation. The original code suffers from shortcommits, some of which were result of the migration to the new core. The function that decodes destination sets encoded in AVPs has been improved, because the original version did not handle properly strings with missing elements. In such case the original implementation was likely to overwrite memory, because it did not check the return value of strchr properly. The new implementation tries to handle this situation. It continues parsing as long as it can, it only requires that the request-uri string is present, all other fields are made optional and their variables are properly initialized if their values cannot be found in the AVP. There was a bug in the implementation of fr_inv_timer_next modparam in the original version, changes to the parameter value were ignored by the serial forking code. This was reported by Andrei and is now fixed by this commit. The parameter fr_inv_timer_next can now be configured at runtime with the configuration framework. Its value is in milliseconds and unlike fr_inv_timer, this timer cannot be configured separately for individual branches. Obsolete definition of INV_FR_TIME_OUT_FIRST has been removed. That macro is not used anywhere in the code, thus it is not needed. There were several places where LM_DBG printed a string and relied on the string being zero terminated, this may or may not be true in the future and this patch uses the macro STR_FMT where appropriate, which is safer. Function t_next_contacts now checks if the function decode_branch_info really returned values for the dst_uri and the path vector. If not then it calls reset_dst_uri and reset_path_vector. Previous version of the code crashed sip-router, this is likely due to the merge and updates in the sip-router core. We now use t_set_fr in t_next_contacts for setting the fr_inv_timer value to fr_inv_timer_next. This is much more efficient than creating AVPs with new timer values. Also the new value of the timer is now taken from a variable in the configuration framework, instead of just a regular global variable configured through modparam. This way we can adjust the value of the timer on the fly. Configuring it through modparam is, of course, possible too. The value of of fr_inv_timer_next is now in milliseconds, instead of seconds. That's the only possibly incompatible change. However, this is consistent with all other timers in tm module, it is more efficient and it offers better granularity. A missing call to destroy_avp has been added to t_next_contacts, in the code which is executed when no transaction exists. There, the avp should also be destroyed if all values have been exhausted and none of them had Q_FLAG set. This is a corner case which should not happen under normal circumstances, because that situation only happens if all branches have the same q value. Such AVP would not have been created by t_load_contacts and therefore t_next_contacts should not be called, but this bug may be triggered if someone uses t_next_contacts in an unexpected way and it is probably better to have it fixed. Also the code which restores the value of fr_inv_timer at the end of t_next_contacts did not work properly. This patch fixes that. It first tries to retrieve a value configured with t_set_fr, but that is not guaranteed to succeed. After that it also tries the timer AVP and finally the configuration framework. The configuration framework always yields a value, so we can always restore the timer value, but we may fail to restore individual transaction timer values set by t_set_fr. If that fails then the global value from the configuration framework is used. This is documented as a shortcomming in the README and in the code. In addition to code changes this patch also expands documentation on functions t_load_contacts and t_next_contacts, describing their operation in more detail. Also the format of the contacts AVP is now documented. Finally, there is a whole new section in the README which describes how serial/parallel forking can be achieved with t_load_contacts and t_next_contacts and provides a number of examples. --- modules/tm/README | 592 +++++++++++++++++++++++++++--------------- modules/tm/config.c | 7 +- modules/tm/config.h | 3 +- modules/tm/doc/functions.xml | 129 ++++++++-- modules/tm/doc/params.xml | 83 +++++-- modules/tm/doc/tm.xml | 218 ++++++++++++++++ modules/tm/t_serial.c | 208 ++++++++++------ modules/tm/tm.c | 2 +- 8 files changed, 900 insertions(+), 342 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ed3…

15 years, 2 months

stored message are not removed after delivery

by jh＠tutpro.com

today i noticed that stored messages are not removed from silo table after delivery and they will be delivered again target ua re-registers after an hour. target ua receives the stored messages normally and wireshark shows that 200 ok gets back to sr fine. sr does not try to resend message, so i assume that its transaction layer accept the 200 ok. any ideas why delivered messages stay in silo table. this has worked fine in k. -- juha

15 years, 2 months

SF.net SVN: openser:[5952] branches/1.5/modules/sanity/sanity.c

by Daniel-Constantin Mierla

Revision: 5952 http://openser.svn.sourceforge.net/openser/?rev=5952&view=rev Author: miconda Date: 2009-11-01 15:56:46 +0000 (Sun, 01 Nov 2009) Log Message: ----------- - one more proper return check for r-uri parsing Modified Paths: -------------- branches/1.5/modules/sanity/sanity.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 2 months

SF.net SVN: openser:[5951] branches/1.5/modules/pv/pv_trans.c

by Daniel-Constantin Mierla

Revision: 5951 http://openser.svn.sourceforge.net/openser/?rev=5951&view=rev Author: miconda Date: 2009-11-01 15:50:10 +0000 (Sun, 01 Nov 2009) Log Message: ----------- - reset entire local structure holding To value instead of just len Modified Paths: -------------- branches/1.5/modules/pv/pv_trans.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev