sr-dev

sr-dev@lists.kamailio.org

12 participants
44198 discussions

git:master: @ruri.rn_user is introduced.

by Miklos Tirpak

Module: sip-router Branch: master Commit: c98100c76d257308bf6ad600a6e48604ed85efe1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c98100c… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed May 13 16:59:39 2009 +0200 @ruri.rn_user is introduced. - The select call returns the value of "rn" parameter if exists, otherwise the user name of the URI. Visual separators are removed from the user name if needed, and they are always removed from the "rn" parameter value. - Nested function call, it works with any URI. --- select_core.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++--------- select_core.h | 2 + 2 files changed, 76 insertions(+), 15 deletions(-) diff --git a/select_core.c b/select_core.c index ffe874d..79b49ca 100644 --- a/select_core.c +++ b/select_core.c @@ -717,6 +717,74 @@ int select_uri_user(str* res, select_t* s, struct sip_msg* msg) RETURN0_res(uri.user); } +/* search for a parameter with "name" + * Return value: + * 0: not found + * 1: found + * -1: error + * + * val is set to the value of the parameter. + */ +static inline int search_param(str *params, char *name, int name_len, + str *val) +{ + param_hooks_t h; + param_t *p, *list; + + if (params->s == NULL) + return 0; + + if (parse_params(params, CLASS_ANY, &h, &list) < 0) + return -1; + for (p = list; p; p=p->next) { + if ((p->name.len == name_len) + && (strncasecmp(p->name.s, name, name_len) == 0) + ) { + *val=p->body; + free_params(list); + return 1; + } + } + free_params(list); + return 0; +} + +/* Return the value of the "rn" parameter if exists, otherwise the user name. + * The user name is normalized if needed, i.e. visual separators are removed, + * the "rn" param is always normalized. */ +int select_uri_rn_user(str* res, select_t* s, struct sip_msg* msg) +{ + int ret; + str val; + + if (parse_uri(res->s, res->len, &uri)<0) + return -1; + + /* search for the "rn" parameter */ + if ((ret = search_param(&uri.params, "rn", 2, &val)) != 0) + goto done; + + if (uri.sip_params.s != uri.params.s) { + /* check also the original sip: URI parameters */ + if ((ret = search_param(&uri.sip_params, "rn", 2, &val)) != 0) + goto done; + } + + if ((uri.flags & URI_USER_NORMALIZE) == 0) + RETURN0_res(uri.user); + /* else normalize the user name */ + val = uri.user; +done: + if (ret < 0) + return -1; /* error */ + + if (!(res->s=get_static_buffer(val.len))) + return -1; + if ((res->len=normalize_tel_user(res->s, &val))==0) + return 1; + return 0; +} + int select_uri_pwd(str* res, select_t* s, struct sip_msg* msg) { if (parse_uri(res->s, res->len, &uri)<0) @@ -832,8 +900,6 @@ int select_uri_params(str* res, select_t* s, struct sip_msg* msg) int select_any_params(str* res, select_t* s, struct sip_msg* msg) { - param_hooks_t h; - param_t *p, *list=NULL; str* wanted; int i; @@ -851,20 +917,13 @@ int select_any_params(str* res, select_t* s, struct sip_msg* msg) wanted=&s->params[s->param_offset[select_level]+1].v.s; if (!res->len) return -1; - if (parse_params(res, CLASS_ANY, &h, &list)<0) return -1; - - for (p = list; p; p=p->next) { - if ((p->name.len==wanted->len) && - !strncasecmp(p->name.s, wanted->s,wanted->len)) { - *res=p->body; - free_params(list); - return (res->len ? 0 : 1); - } - } - free_params(list); - DBG("SELECT ...uri.params.%s NOT FOUND !\n", wanted->s); - return -1; + if (search_param(res, wanted->s, wanted->len, res) <= 0) { + DBG("SELECT ...uri.params.%s NOT FOUND !\n", wanted->s); + return -1; + } else { + return (res->len) ? 0 : 1; + } } int select_event(str* res, select_t* s, struct sip_msg* msg) diff --git a/select_core.h b/select_core.h index 6b2baff..f348be7 100644 --- a/select_core.h +++ b/select_core.h @@ -153,6 +153,7 @@ SELECT_F(select_any_params) SELECT_F(select_any_uri) SELECT_F(select_uri_type) SELECT_F(select_uri_user) +SELECT_F(select_uri_rn_user) SELECT_F(select_uri_pwd) SELECT_F(select_uri_host) SELECT_F(select_uri_port) @@ -278,6 +279,7 @@ static select_row_t select_core[] = { { select_rr_uri, SEL_PARAM_INT, STR_NULL, select_any_uri, NESTED}, { select_any_uri, SEL_PARAM_STR, STR_STATIC_INIT("type"), select_uri_type, 0}, { select_any_uri, SEL_PARAM_STR, STR_STATIC_INIT("user"), select_uri_user, 0}, + { select_any_uri, SEL_PARAM_STR, STR_STATIC_INIT("rn_user"), select_uri_rn_user, 0}, { select_any_uri, SEL_PARAM_STR, STR_STATIC_INIT("pwd"), select_uri_pwd, 0}, { select_any_uri, SEL_PARAM_STR, STR_STATIC_INIT("host"), select_uri_host, 0}, { select_any_uri, SEL_PARAM_STR, STR_STATIC_INIT("port"), select_uri_port, 0},

15 years, 8 months

git:master: @ruri.params["foo"] checks also the original sip: URI parameters

by Miklos Tirpak

Module: sip-router Branch: master Commit: 948e083f7c681b9aaa8729aea019ebea3ee1ac2c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=948e083… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed May 13 14:57:26 2009 +0200 @ruri.params["foo"] checks also the original sip: URI parameters This patch increases the compatibility with non-standard implementations when the parameters are added to the end of the sip: URI instead of the userinfo part in case of a tel: URI embedded in a sip: URI. For example: sip:123@domain;foo=bar;user=phone instead of sip:123;foo=bar@domain;user=phone --- select_core.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/select_core.c b/select_core.c index 68a1b37..ffe874d 100644 --- a/select_core.c +++ b/select_core.c @@ -806,6 +806,7 @@ int select_uri_proto(str* res, select_t* s, struct sip_msg* msg) int select_uri_params(str* res, select_t* s, struct sip_msg* msg) { + int ret; if (!msg || !res) { return select_any_params(res, s, msg); } @@ -817,7 +818,16 @@ int select_uri_params(str* res, select_t* s, struct sip_msg* msg) RETURN0_res(uri.params); *res=uri.params; - return select_any_params(res, s, msg); + ret = select_any_params(res, s, msg); + if ((ret < 0) + && (uri.sip_params.s != NULL) + && (uri.sip_params.s != uri.params.s) + ) { + /* Search also in the original sip: uri parameters. */ + *res = uri.sip_params; + ret = select_any_params(res, s, msg); + } + return ret; } int select_any_params(str* res, select_t* s, struct sip_msg* msg)

15 years, 8 months

git:master: refine registrar tests, bug #2790184, port from kamailio r5837

by Henning Westerholt

Module: sip-router Branch: master Commit: db9c2d1d90db2e031692c6645aef5ac8aa916ddb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=db9c2d1… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed May 13 15:25:52 2009 +0200 refine registrar tests, bug #2790184, port from kamailio r5837 --- test/unit/11.cfg | 6 ------ test/unit/19.cfg | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/test/unit/11.cfg b/test/unit/11.cfg index 314bccb..70a9cfa 100644 --- a/test/unit/11.cfg +++ b/test/unit/11.cfg @@ -21,7 +21,6 @@ loadmodule "usrloc" modparam("usrloc", "db_mode", 1) loadmodule "registrar" -modparam("registrar", "reg_callid_avp", "$avp(s:foobar)") modparam("registrar", "min_expires", 5) modparam("usrloc", "timer_interval", 2) @@ -61,11 +60,6 @@ route{ sl_send_reply("404", "Not Found"); exit; } - $avp(s:foobar) = $ci + "bar"; -# $avp(s:foobar) = $ci; - if (registered("location")) { - xlog("already registered"); - } append_hf("P-hint: usrloc applied\r\n"); } diff --git a/test/unit/19.cfg b/test/unit/19.cfg index 8f5586c..0bfa64a 100644 --- a/test/unit/19.cfg +++ b/test/unit/19.cfg @@ -17,8 +17,10 @@ loadmodule "registrar/registrar.so" loadmodule "sl/sl.so" loadmodule "tm/tm.so" loadmodule "maxfwd/maxfwd.so" +loadmodule "pv/pv.so" #for debugging purposes only loadmodule "mi_fifo/mi_fifo.so" +loadmodule "xlog/xlog.so" #-----------------------Module parameters------------------------------------- @@ -33,6 +35,11 @@ route{ exit(); } + if (registered("location")) { + xlog("contact registered"); + } + + if(!lookup ("location")){ sl_send_reply("404", "Not Found"); }

15 years, 8 months

git:master: Merge branch 'master' of ssh://tirpi@git.sip-router.org/ sip-router

by Miklos Tirpak

Module: sip-router Branch: master Commit: a2ad989437a015a6e90a6f3b9bb81b4f7d20a32d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a2ad989… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed May 13 15:06:07 2009 +0200 Merge branch 'master' of ssh://tirpi@git.sip-router.org/sip-router * 'master' of ssh://tirpi@git.sip-router.org/sip-router: * Fixed pua module memory leak. Credits to Anca Vamanu. fix k bug #2790184, crash related to uninitialized match_callid parameter ---

15 years, 8 months

git:master: * Fixed pua module memory leak. Credits to Anca Vamanu.

by Juha Heinanen

Module: sip-router Branch: master Commit: 254468611e043f3bfd8fcc88155fab87ff4a5bde URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2544686… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed May 13 15:39:09 2009 +0300 * Fixed pua module memory leak. Credits to Anca Vamanu. --- modules_k/pua/add_events.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules_k/pua/add_events.c b/modules_k/pua/add_events.c index a769768..cfaa58a 100644 --- a/modules_k/pua/add_events.c +++ b/modules_k/pua/add_events.c @@ -114,10 +114,11 @@ int pres_process_body(publ_info_t* publ, str** fin_body, int ver, str** tuple_pa LM_ERR("while extracting tuple node\n"); goto error; } + tuple= *(tuple_param); + tuple_id= xmlNodeGetAttrContentByName(node, "id"); if(tuple_id== NULL) { - tuple= *(tuple_param); if(tuple== NULL) // generate a tuple_id { @@ -144,7 +145,6 @@ int pres_process_body(publ_info_t* publ, str** fin_body, int ver, str** tuple_pa alloc_tuple= 1; LM_DBG("allocated tuple_id\n\n"); - } else { @@ -152,7 +152,7 @@ int pres_process_body(publ_info_t* publ, str** fin_body, int ver, str** tuple_pa tuple_id_len= tuple->len; memcpy(tuple_id, tuple->s, tuple_id_len); tuple_id[tuple_id_len]= '\0'; - } + } /* add tuple id */ if(!xmlNewProp(node, BAD_CAST "id", BAD_CAST tuple_id)) { @@ -184,10 +184,10 @@ int pres_process_body(publ_info_t* publ, str** fin_body, int ver, str** tuple_pa } memcpy(tuple->s, tuple_id, tuple_id_len); tuple->len= tuple_id_len; + *tuple_param= tuple; alloc_tuple= 1; - - } - } + } + } node= xmlDocGetNodeByName(doc, "person", NULL); if(node)

15 years, 8 months

git:master: fix k bug #2790184, crash related to uninitialized match_callid parameter

by Henning Westerholt

Module: sip-router Branch: master Commit: 3f9ed10dc5a589605dfd6212ec835032cbfa5af3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3f9ed10… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed May 13 13:03:30 2009 +0200 fix k bug #2790184, crash related to uninitialized match_callid parameter - reported from Inaki, port from kamailio r5835 --- modules_k/registrar/lookup.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules_k/registrar/lookup.c b/modules_k/registrar/lookup.c index 5dcc924..2f5644f 100644 --- a/modules_k/registrar/lookup.c +++ b/modules_k/registrar/lookup.c @@ -179,6 +179,7 @@ int registered(struct sip_msg* _m, char* _t, char* _s) urecord_t* r; ucontact_t* ptr; int res; + int_str match_callid; if (_m->new_uri.s) uri = _m->new_uri; else uri = _m->first_line.u.request.uri; @@ -199,12 +200,15 @@ int registered(struct sip_msg* _m, char* _t, char* _s) if (res == 0) { - int_str match_callid; if (reg_callid_avp_name.n) { struct usr_avp *avp = search_first_avp( reg_callid_avp_type, reg_callid_avp_name, &match_callid, 0); if (!(avp && is_avp_str_val(avp))) - match_callid=(int_str)0; + match_callid.n = 0; + match_callid.s.s = NULL; + } else { + match_callid.n = 0; + match_callid.s.s = NULL; } for (ptr = r->contacts; ptr; ptr = ptr->next) {

15 years, 8 months

sip_uri structure

by Miklos Tirpak

Hello, I am wondering whether I can add a new parameter (or possibly parameters) to the sip_uri structure because of performance reasons. There are some parameter values that need to be accessed frequently, and having a short-cut to them would be very good, otherwise the linked list for the parameters is always constructed and freed. The current request is for the "rn" parameter from RFC 4694 which may be checked as frequently as ruri.user in certain deployments. If the memory usage is a concern then I can also introduce a #define statement, something like URI_PARAM_SHORTCUTS. Thanks, Miklos

15 years, 8 months

git:master: typo correction

by Miklos Tirpak

Module: sip-router Branch: master Commit: 205c28ae0de03703fedf235d27f5244a45e3b1d1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=205c28a… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed May 13 08:51:27 2009 +0200 typo correction --- modules_s/cfg_rpc/README | 2 +- modules_s/cfg_rpc/doc/rpc.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_s/cfg_rpc/README b/modules_s/cfg_rpc/README index 7e457da..c3cdc80 100644 --- a/modules_s/cfg_rpc/README +++ b/modules_s/cfg_rpc/README @@ -33,7 +33,7 @@ Miklos Tirpak accepts three parameters: group name, variable name, string value. * cfg_rpc.commit - Commit the previously prepared configuration changes. The function does not have any parameters. - * cfg_rpc.rollback - Drop the prepared configuration changed. The + * cfg_rpc.rollback - Drop the prepared configuration changes. The function does not have any parameters. * cfg_rpc.get - Get the value of a configuration variable. The function accepts two parameters: group name, variable name. diff --git a/modules_s/cfg_rpc/doc/rpc.xml b/modules_s/cfg_rpc/doc/rpc.xml index eb1e8a0..9307c0a 100644 --- a/modules_s/cfg_rpc/doc/rpc.xml +++ b/modules_s/cfg_rpc/doc/rpc.xml @@ -52,7 +52,7 @@ <listitem> <para> <emphasis>cfg_rpc.rollback</emphasis> - Drop the prepared - configuration changed. The function does not have any + configuration changes. The function does not have any parameters. </para> </listitem>

15 years, 8 months

K modules fully ported to SR

by Iñaki Baz Castillo

Hi, which would be the best example of an already ported Kamailio module? I mean a Kamailio module that has been *fully* ported (this involves using the "new"/definitive MI system and so on). I know that there are some K module ported but they still use the K MI functions. Thanks a lot. -- Iñaki Baz Castillo <ibc(a)aliax.net>

15 years, 8 months

git:master: * Moved modules_k/utils to modules ( it does not exist in s and contains

by Juha Heinanen

Module: sip-router Branch: master Commit: b24ce7c29876f747c35b185233de70115c0a03cd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b24ce7c… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon May 11 18:17:17 2009 +0300 * Moved modules_k/utils to modules (it does not exist in s and contains functions that don't exist in s). --- {modules_k => modules}/utils/Makefile | 0 {modules_k => modules}/utils/README | 0 {modules_k => modules}/utils/conf.c | 0 {modules_k => modules}/utils/conf.h | 0 {modules_k => modules}/utils/doc/Makefile | 0 {modules_k => modules}/utils/doc/utils.xml | 0 {modules_k => modules}/utils/doc/utils_admin.xml | 0 {modules_k => modules}/utils/functions.c | 0 {modules_k => modules}/utils/functions.h | 0 {modules_k => modules}/utils/utils.c | 0 {modules_k => modules}/utils/utils.h | 0 11 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules_k/utils/Makefile b/modules/utils/Makefile similarity index 100% rename from modules_k/utils/Makefile rename to modules/utils/Makefile diff --git a/modules_k/utils/README b/modules/utils/README similarity index 100% rename from modules_k/utils/README rename to modules/utils/README diff --git a/modules_k/utils/conf.c b/modules/utils/conf.c similarity index 100% rename from modules_k/utils/conf.c rename to modules/utils/conf.c diff --git a/modules_k/utils/conf.h b/modules/utils/conf.h similarity index 100% rename from modules_k/utils/conf.h rename to modules/utils/conf.h diff --git a/modules_k/utils/doc/Makefile b/modules/utils/doc/Makefile similarity index 100% rename from modules_k/utils/doc/Makefile rename to modules/utils/doc/Makefile diff --git a/modules_k/utils/doc/utils.xml b/modules/utils/doc/utils.xml similarity index 100% rename from modules_k/utils/doc/utils.xml rename to modules/utils/doc/utils.xml diff --git a/modules_k/utils/doc/utils_admin.xml b/modules/utils/doc/utils_admin.xml similarity index 100% rename from modules_k/utils/doc/utils_admin.xml rename to modules/utils/doc/utils_admin.xml diff --git a/modules_k/utils/functions.c b/modules/utils/functions.c similarity index 100% rename from modules_k/utils/functions.c rename to modules/utils/functions.c diff --git a/modules_k/utils/functions.h b/modules/utils/functions.h similarity index 100% rename from modules_k/utils/functions.h rename to modules/utils/functions.h diff --git a/modules_k/utils/utils.c b/modules/utils/utils.c similarity index 100% rename from modules_k/utils/utils.c rename to modules/utils/utils.c diff --git a/modules_k/utils/utils.h b/modules/utils/utils.h similarity index 100% rename from modules_k/utils/utils.h rename to modules/utils/utils.h

15 years, 8 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev