sr-dev

sr-dev@lists.kamailio.org

12 participants
44199 discussions

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 60aee183d5a11e73187476acd51a8fef0c939b9e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=60aee18… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jun 1 20:47:36 2009 +0300 sl(k) - use load_tm_api() - better way to load the tm api as SR TM exports functions with NO_SCRIPT flag - reported by Juha Heinanen --- modules_k/sl/sl.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/modules_k/sl/sl.c b/modules_k/sl/sl.c index 293246c..5c41c59 100644 --- a/modules_k/sl/sl.c +++ b/modules_k/sl/sl.c @@ -148,8 +148,6 @@ struct module_exports exports= { static int mod_init(void) { - load_tm_f load_tm; - /* if statistics are disabled, prevent their registration to core */ if (sl_enable_stats==0) exports.stats = 0; @@ -179,11 +177,10 @@ static int mod_init(void) if(sl_bind_tm!=0) { - if ( (load_tm=(load_tm_f)find_export("load_tm", 0, 0))) + if(load_tm_api(&tmb)==-1) { - load_tm( &tmb ); - } else { - LM_INFO("could not bind tm module - only stateless mode available\n"); + LM_INFO("could not bind tm module - only stateless mode" + " available\n"); sl_bind_tm=0; } }

15 years, 7 months

textops gives lots of warnings

by jh＠tutpro.com

i'm getting from textops module lots of warnings like this: Jun 1 20:24:49 localhost /usr/sbin/sip-router[14871]: INFO: textops [textops.c:1527]: using hdr type (11) instead of <Content-Type> are they really necessary? i would prefer not to get them. -- juha

15 years, 7 months

git:master: * modules_k/textops

by Juha Heinanen

Module: sip-router Branch: master Commit: dc40d6122850463aee6c777fa1b3e190a9dbdc14 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dc40d61… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon Jun 1 20:45:18 2009 +0300 * modules_k/textops * Changed "using hdr type" messages from INFO level to DBG level. --- modules_k/textops/textops.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/textops/textops.c b/modules_k/textops/textops.c index ae40e1a..38d1287 100644 --- a/modules_k/textops/textops.c +++ b/modules_k/textops/textops.c @@ -1523,7 +1523,7 @@ static int hname_fixup(void** param, int param_no) if (hdr.type!=HDR_OTHER_T && hdr.type!=HDR_ERROR_T) { - LM_INFO("using hdr type (%d) instead of <%.*s>\n", + LM_DBG("using hdr type (%d) instead of <%.*s>\n", hdr.type, gp->v.str.len, gp->v.str.s); pkg_free(gp->v.str.s); gp->v.str.s = NULL; @@ -1531,7 +1531,7 @@ static int hname_fixup(void** param, int param_no) gp->type = GPARAM_TYPE_INT; } else { gp->type = GPARAM_TYPE_STR; - LM_INFO("using hdr type name <%.*s>\n", gp->v.str.len, gp->v.str.s); + LM_DBG("using hdr type name <%.*s>\n", gp->v.str.len, gp->v.str.s); } *param = (void*)gp;

15 years, 7 months

git:master: pv: parse K-style AVP aliases

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: f2a2c54faf21bde2e4418b2590458c009e7e8ba9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f2a2c54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jun 1 20:36:07 2009 +0300 pv: parse K-style AVP aliases --- modules_k/pv/pv_core.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/modules_k/pv/pv_core.c b/modules_k/pv/pv_core.c index 9103d81..87b83fe 100644 --- a/modules_k/pv/pv_core.c +++ b/modules_k/pv/pv_core.c @@ -2062,7 +2062,6 @@ int pv_parse_avp_name(pv_spec_p sp, str *in) char *p; char *s; pv_spec_p nsp = 0; - int avp_index; if(in==NULL || in->s==NULL || sp==NULL) return -1; @@ -2089,9 +2088,8 @@ int pv_parse_avp_name(pv_spec_p sp, str *in) return 0; } /*LM_DBG("static name [%.*s]\n", in->len, in->s);*/ - avp_index = 0; - if(parse_avp_spec(in, &sp->pvp.pvn.u.isname.type, - &sp->pvp.pvn.u.isname.name, &avp_index)!=0) + if(km_parse_avp_spec(in, &sp->pvp.pvn.u.isname.type, + &sp->pvp.pvn.u.isname.name)!=0) { LM_ERR("bad avp name [%.*s]\n", in->len, in->s); return -1;

15 years, 7 months

git:master: core: added km_parse_avp_spec()

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 34b688d7ecba60268bae2a24e62dcc4a0d80c91f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=34b688d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jun 1 20:36:54 2009 +0300 core: added km_parse_avp_spec() - K compatible avp spec parser --- usr_avp.c | 18 ++++++++++++++++++ usr_avp.h | 1 + 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/usr_avp.c b/usr_avp.c index 2a25dfd..17d4cc9 100644 --- a/usr_avp.c +++ b/usr_avp.c @@ -1031,6 +1031,24 @@ void free_avp_ident(avp_ident_t* attr) } } +int km_parse_avp_spec( str *name, int *type, int_str *avp_name) +{ + char *p; + int index = 0; + + if (name==0 || name->s==0 || name->len==0) + return -1; + + p = (char*)memchr((void*)name->s, ':', name->len); + if (p==NULL) { + /* it's an avp alias */ + return lookup_avp_galias( name, type, avp_name); + } else { + return parse_avp_name( name, type, avp_name, &index); + } +} + + int parse_avp_spec( str *name, int *type, int_str *avp_name, int *index) { str alias; diff --git a/usr_avp.h b/usr_avp.h index 871c310..324bad4 100644 --- a/usr_avp.h +++ b/usr_avp.h @@ -216,6 +216,7 @@ int add_avp_galias(str *alias, int type, int_str avp_name); int parse_avp_ident( str *name, avp_ident_t* attr); int parse_avp_name( str *name, int *type, int_str *avp_name, int *index); int parse_avp_spec( str *name, int *type, int_str *avp_name, int *index); +int km_parse_avp_spec( str *name, int *type, int_str *avp_name); void free_avp_name( avp_flags_t *type, int_str *avp_name); /* Free an ident obtained with parse_avp_ident() */ void free_avp_ident(avp_ident_t* attr);

15 years, 7 months

i: and s: avp name syntax is deprecated

by jh＠tutpro.com

i'm getting five of these to syslog: Jun 1 20:11:42 localhost /usr/sbin/sip-router[14204]: WARNING: <core> [usr_avp.c:882]: i: and s: avp name syntax is deprecated! i checked and the only place where i have i: or s: are the tm module params that we discussed with jan about: # egrep 'i:' /etc/sip-router/sip-router.cfg alias=sip.test.fi:5060 modparam("tm", "fr_inv_timer_avp", "i:704") modparam("tm", "fr_timer_avp", "i:705") modparam("tm", "contacts_avp", "i:711") that is three, not five. i wonder where those five warning come from? -- juha

15 years, 7 months

setbflag

by jh＠tutpro.com

kex module documentation has: 3.4. setbflag(flag [, branch]) flag - the index of the branch flag to be set. Can be integer or pseudo-variable with integer value. are quotes "" always required? setbflag(1); does not give an error (or at least i cannot find one from among all those debug messages that seem to be on by default). if quotes are required, is it sure that if string is an int, it will be evaluated when the script is processed and not when script is run? -- juha

15 years, 7 months

tm doc - table of content

by Daniel-Constantin Mierla

Hello, the html file generated from tm module docbook does not have a table of content, which is very handy to browse and have links inside the file when referring to a function or parameter. See for comparison: http://sip-router.org/docbook/sip-router/branch/master/modules/tm/tm.html http://sip-router.org/docbook/sip-router/branch/master/modules/lcr/lcr.html This seems to be because of using <section> as root tag, the modules coming from K use <book> and ToC is generated. I tried with <chapter> as root tag and I got ToC. Can be <section> upgraded to <chapter>/<book>? Or is used somewhere in this form and shall have new file, like tm-book.html, that has <book> at top of document and will be used for online docs? Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com/

15 years, 7 months

syntax error in while condition

by jh＠tutpro.com

i'm not down to 3 syntax errors from 600+. here is one of them: while (1) { 0(7054) WARNING: <core> [cfg.y:2898]: warning in config file, line 1838, column 12: constant value in while(...) how do i write a while statement where condition is always true? -- juha

15 years, 7 months

git:tirpi/script_callbacks: script callbacks: corrections

by Miklos Tirpak

Module: sip-router Branch: tirpi/script_callbacks Commit: d14f231501cedebd1d9c5956a98aec5f01b6413c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d14f231… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Mon Jun 1 17:33:38 2009 +0200 script callbacks: corrections - callbacks have been tested, bugs found have been corrected. --- script_cb.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/script_cb.c b/script_cb.c index 729eda4..c715dc8 100644 --- a/script_cb.c +++ b/script_cb.c @@ -160,8 +160,8 @@ int exec_pre_script_cb( struct sip_msg *msg, enum script_cb_type type) abort(); } #endif - flags = PRE_SCRIPT_CB & (1<<(type-1)); - for (cb=pre_script_cb[type]; cb ; cb=cb->next ) { + flags = PRE_SCRIPT_CB | (1<<(type-1)); + for (cb=pre_script_cb[type-1]; cb ; cb=cb->next ) { /* stop on error */ if (cb->cbf(msg, flags, cb->param)==0) return 0; @@ -183,8 +183,8 @@ int exec_post_script_cb( struct sip_msg *msg, enum script_cb_type type) abort(); } #endif - flags = POST_SCRIPT_CB & (1<<(type-1)); - for (cb=post_script_cb[type]; cb ; cb=cb->next){ + flags = POST_SCRIPT_CB | (1<<(type-1)); + for (cb=post_script_cb[type-1]; cb ; cb=cb->next){ cb->cbf(msg, flags, cb->param); } return 1;

15 years, 7 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev