sr-dev

sr-dev@lists.kamailio.org

12 participants
42800 discussions

by Daniel-Constantin Mierla

Hello, there are couple of modules that change the R-URI and automatically call append_branch() if the execution takes place in failure_route, other modules don't. Perhaps we should get to a coherent behavior, if not for existing code, then for the future. Probably the most flexible, better in my opinion, is to let script writer to call append_branch() in config -- once done, it is no way now to revert. A new branch should be automatically done only if it is a specific operation, e.g., location lookup with more than one record. What do you think? Cheers, Daniel PS. this blending of the ser-kamailio sources gives me ideas to do some cleanup as I review the code ... especially after midnight ... -- Daniel-Constantin Mierla http://www.asipto.com

15 years, 5 months

git:daniel/pv: - list of PVs types syncronized with Kamailio

by Daniel-Constantin Mierla

Module: sip-router Branch: daniel/pv Commit: e7745e9a2a37a56ea71ec72eb8fbbdfc837f0dcb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e7745e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 28 00:13:47 2008 +0200 - list of PVs types syncronized with Kamailio --- pvar.h | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/pvar.h b/pvar.h index 811ea34..e8482f5 100644 --- a/pvar.h +++ b/pvar.h @@ -72,7 +72,11 @@ enum _pv_type { PVT_NONE=0, PVT_EMPTY, PVT_NULL, - PVT_MARKER, PVT_AVP, PVT_COLOR, + PVT_MARKER, PVT_AVP, PVT_HDR, + PVT_RURI, PVT_RURI_USERNAME, PVT_RURI_DOMAIN, + PVT_DSTURI, PVT_COLOR, PVT_BRANCH, + PVT_FROM, PVT_TO, PVT_OURI, + PVT_SCRIPTVAR, PVT_MSG_BODY, PVT_OTHER, PVT_EXTRA /* keep it last */ };

15 years, 5 months

git:andrei/fixups: avp: comments fix

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/fixups Commit: 70346b5ba3cf7e2c28f61ab8bf7f8d37abec800e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=70346b5… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Nov 27 13:55:24 2008 +0100 avp: comments fix - parse_avp_indent comments: 'g' it's an avp "class" and not a "track" Reported-by: Jan Janak, jan at iptel.org --- usr_avp.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/usr_avp.c b/usr_avp.c index eea9894..b5c8455 100644 --- a/usr_avp.c +++ b/usr_avp.c @@ -854,10 +854,10 @@ int parse_avp_name( str *name, int *type, int_str *avp_name, int *index) * <id> = ascii string w/o '[', ']', '.' and '/' * <name> = <id> | '/' regex '/' * (Note: regex use is deprecated) - * <track> = 'f' | 't' | 'g' - * (from, to or global) - * <class> = 'r' | 'u' | 'd' - * (uri, user or domain) + * <track> = 'f' | 't' + * (from or to) + * <class> = 'r' | 'u' | 'd' | 'g' + * (uri, user, domain or global) * <index> = <number> | '-' <number> | '' * (the avp index, if missing it means AVP_INDEX_ALL, but * it's use is deprecated)

15 years, 5 months

static buffers

by Daniel-Constantin Mierla

Hello, There seem to be many places where static buffers are used for building strings. It is clear they are used just for usage inside some functions, with no need to keep the value for usage somewhere else. Would defining a global static buffer to be used for such cases make sense? The access to the pointer and size can be given via functions. There could be couple of such buffers to be used in the cases one function need concurrent access to more than one ... opinions? It will reduce memory space reserved and used... Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com

15 years, 5 months

git:master: Merge commit 'origin/henning/trie'

by Henning Westerholt

Module: sip-router Branch: master Commit: ecaca6b8fc03cdc0a0668175719dcba5ae3fe280 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ecaca6b… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Nov 27 14:00:30 2008 +0100 Merge commit 'origin/henning/trie' * commit 'origin/henning/trie': add trie to library directory add SHM_MEM_ERROR and PKG_MEM_ERROR logging macros to mem.h ---

15 years, 5 months

git version >= 1.5.6

by Andrei Pelinescu-Onciul

It's highly recommended to use git versions >= 1.5.6 (e.g. 1.5.6.1, 1.6.0.4 a.s.o) if you use/do git merge. Older versions do not support the merge.log options or git merge --log and _will_ not generate merge summaries in the merge commit messages (which are very nice to have). If you have an older version and you don't want to upgrade try setting merge.summary (git config merge.summary true). Andrei

15 years, 5 months

git:master: Merge commit 'origin/henning/trie'

by Henning Westerholt

Module: sip-router Branch: master Commit: bf71cd13797041ad85bd8fa6345f644b63fd8ca0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf71cd1… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Nov 27 11:16:31 2008 +0100 Merge commit 'origin/henning/trie' ---

15 years, 5 months

git:andrei/fixups: fixups: fix param function using a param type mask

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/fixups Commit: bf9d1c43796843bb25f33ab68d219806c5286506 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf9d1c4… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Nov 27 01:47:23 2008 +0100 fixups: fix param function using a param type mask - added generic fix_param_type(types_mask, param) function which will try all the types specified in the mask in sequence, until if manages to convert the param to the corresponding type, or it finishes iterating through the types. (e.g. fix_param_types(FPARAM_AVP|FPARAM_SELECT|FPARAM_STR, param)) - changed FPARAM_* order such that more generic types are at the end (types having less chance of failing a conversion, like FPARAM_STR) --- sr_module.c | 22 ++++++++++++++++++++++ sr_module.h | 29 ++++++++++++++++++++--------- 2 files changed, 42 insertions(+), 9 deletions(-) diff --git a/sr_module.c b/sr_module.c index 114f0d2..497f8b7 100644 --- a/sr_module.c +++ b/sr_module.c @@ -38,6 +38,7 @@ * 2006-02-07 added fix_flag (andrei) * 2008-02-29 store all the reponse callbacks in their own array (andrei) * 2008-11-17 support dual module interface: ser & kamailio (andrei) + * 2008-11-26 added fparam_free_contents() and fix_param_types (andrei) */ @@ -1174,6 +1175,27 @@ void fparam_free_contents(fparam_t* fp) } + +/** fix a param to one of the given types (mask). + * + * @param types - bitmap of the allowed types (e.g. FPARAM_INT|FPARAM_STR) + * @param param - value/result + * @return - 0 on success, -1 on error, 1 if param doesn't + * match any of the types + */ +int fix_param_types(int types, void** param) +{ + int ret; + int t; + + for (t=types & ~(types-1); types; types&=(types-1), t=types & ~(types-1)){ + if ((ret=fix_param(t, param))<=0) return ret; + } + return E_UNSPEC; +} + + + /* * Fixup variable string, the parameter can be * AVP, SELECT, or ordinary string. AVP and select diff --git a/sr_module.h b/sr_module.h index 1af0ea4..149ca6e 100644 --- a/sr_module.h +++ b/sr_module.h @@ -46,6 +46,7 @@ * dual module interface support: ser & kamailio (andrei) * 2008-11-18 prototypes for various fixed parameters numbers module * functions (3, 4, 5 & 6) and variable parameters (andrei) + * 2008-11-26 added fparam_free_contents() and fix_param_types (andrei) */ /*! @@ -234,17 +235,23 @@ struct param_export_ { }; + +/** allowed parameter types. + * the types that cannot be deduced from the string, should + * be at the end (e.g. FPARAM_STR), to allow fallback + * (e.g. fix_param_types(FPARAM_AVP|FPARAM_SELECT|FPARAM_STR, param)) + */ enum { FPARAM_UNSPEC = 0, - FPARAM_STRING = (1 << 0), - FPARAM_STR = (1 << 1), - FPARAM_INT = (1 << 2), - FPARAM_REGEX = (1 << 3), - FPARAM_AVP = (1 << 5), - FPARAM_SELECT = (1 << 6), - FPARAM_SUBST = (1 << 7), - FPARAM_PVS = (1 << 8), - FPARAM_PVE = (1 << 9) + FPARAM_INT = (1 << 0), + FPARAM_REGEX = (1 << 1), + FPARAM_AVP = (1 << 2), + FPARAM_SELECT = (1 << 3), + FPARAM_SUBST = (1 << 4), + FPARAM_PVS = (1 << 5), + FPARAM_PVE = (1 << 6), + FPARAM_STRING = (1 << 7), + FPARAM_STR = (1 << 8) }; /* @@ -419,6 +426,10 @@ int fix_flag( modparam_t type, void* val, int fix_param(int type, void** param); void fparam_free_contents(fparam_t* fp); +/** fix a param to one of the given types (mask). + */ +int fix_param_types(int types, void** param); + /* * Fixup variable string, the parameter can be * AVP, SELECT, or ordinary string. AVP and select

15 years, 5 months

git:andrei/fixups: fixups: added kamailio compatible fixups

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/fixups Commit: 51d1766090690b7a82e1ff45d77e57de5a76523c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=51d1766… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Nov 27 02:46:50 2008 +0100 fixups: added kamailio compatible fixups - added kamailio compatible fixups (e.g. fixup_str_str), which use ser fix_param() underneath - added kamailio compatible macros for gparam_t (which is now fparam_t) and fixup_get_[si]value() (to get_{int,str}_value) --- mod_fix.c | 236 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ mod_fix.h | 123 ++++++++++++++++++++++++++++++++ 2 files changed, 359 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=51d…

15 years, 5 months

git:andrei/fixups: fixups: support for PVE & PVS in get_*_fparam()

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/fixups Commit: 39af8f24dab661a3d1a67098328234be0a755c67 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=39af8f2… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Nov 27 02:34:09 2008 +0100 fixups: support for PVE & PVS in get_*_fparam() - get_str_fparam() and get_int_fparam() support now FPARAM_PVE & FPARAM_PVS --- sr_module.c | 58 ++++++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 44 insertions(+), 14 deletions(-) diff --git a/sr_module.c b/sr_module.c index 497f8b7..e35ee36 100644 --- a/sr_module.c +++ b/sr_module.c @@ -1348,16 +1348,17 @@ int fixup_str_2(void** param, int param_no) } -/* - * Get the function parameter value as string - * Return values: 0 - Success - * -1 - Cannot get value +/** Get the function parameter value as string. + * @return 0 - Success + * -1 - Cannot get value */ int get_str_fparam(str* dst, struct sip_msg* msg, fparam_t* param) { int_str val; int ret; avp_t* avp; + pv_value_t pv_val; + static char pve_buf[256]; /* ugly hack needed for PVE */ switch(param->type) { case FPARAM_REGEX: @@ -1374,12 +1375,12 @@ int get_str_fparam(str* dst, struct sip_msg* msg, fparam_t* param) case FPARAM_AVP: avp = search_first_avp(param->v.avp.flags, param->v.avp.name, &val, 0); - if (!avp) { + if (unlikely(!avp)) { DBG("Could not find AVP from function parameter '%s'\n", param->orig); return -1; } - if (avp->flags & AVP_VAL_STR) { + if (likely(avp->flags & AVP_VAL_STR)) { *dst = val.s; } else { /* The caller does not know of what type the AVP will be so @@ -1390,17 +1391,34 @@ int get_str_fparam(str* dst, struct sip_msg* msg, fparam_t* param) break; case FPARAM_SELECT: ret = run_select(dst, param->v.select, msg); - if (ret < 0 || ret > 0) return -1; + if (unlikely(ret < 0 || ret > 0)) return -1; + break; + case FPARAM_PVS: + if (likely((pv_get_spec_value(msg, param->v.pvs, &pv_val)==0) && + ((pv_val.flags&(PV_VAL_NULL|PV_VAL_STR))==PV_VAL_STR))){ + *dst=pv_val.rs; + }else{ + ERR("Could not convert PV to str\n"); + return -1; + } + break; + case FPARAM_PVE: + dst->len=sizeof(pve_buf); + if (unlikely(pv_printf(msg, param->v.pve, pve_buf, &dst->len)!=0)){ + ERR("Could not convert the PV-formated string to str\n"); + dst->len=0; + return -1; + }; + dst->s=pve_buf; break; } return 0; } -/* - * Get the function parameter value as integer - * Return values: 0 - Success - * -1 - Cannot get value +/** Get the function parameter value as integer. + * @return 0 - Success + * -1 - Cannot get value */ int get_int_fparam(int* dst, struct sip_msg* msg, fparam_t* param) { @@ -1408,6 +1426,7 @@ int get_int_fparam(int* dst, struct sip_msg* msg, fparam_t* param) int ret; avp_t* avp; str tmp; + pv_value_t pv_val; switch(param->type) { case FPARAM_INT: @@ -1421,7 +1440,7 @@ int get_int_fparam(int* dst, struct sip_msg* msg, fparam_t* param) case FPARAM_AVP: avp = search_first_avp(param->v.avp.flags, param->v.avp.name, &val, 0); - if (!avp) { + if (unlikely(!avp)) { DBG("Could not find AVP from function parameter '%s'\n", param->orig); return -1; @@ -1437,12 +1456,23 @@ int get_int_fparam(int* dst, struct sip_msg* msg, fparam_t* param) break; case FPARAM_SELECT: ret = run_select(&tmp, param->v.select, msg); - if (ret < 0 || ret > 0) return -1; - if (str2int(&tmp, (unsigned int*)dst) < 0) { + if (unlikely(ret < 0 || ret > 0)) return -1; + if (unlikely(str2int(&tmp, (unsigned int*)dst) < 0)) { ERR("Could not convert select result to int\n"); return -1; } break; + case FPARAM_PVS: + if (likely((pv_get_spec_value(msg, param->v.pvs, &pv_val)==0) && + ((pv_val.flags&(PV_VAL_NULL|PV_VAL_INT))==PV_VAL_INT))){ + *dst=pv_val.ri; + }else{ + ERR("Could not convert PV to int\n"); + return -1; + } + break; + case FPARAM_PVE: + return -1; } return 0; }

15 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev