sr-dev May 2009

sr-dev@lists.kamailio.org

26 participants
263 discussions

git:master: rpc: added register function and switched to hash table
by Andrei Pelinescu-Onciul 13 May '09

13 May '09

Module: sip-router Branch: master Commit: 5099fd64fb8dcf6445c77bbefda8764c7edf457f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5099fd6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue May 12 00:39:03 2009 +0200 rpc: added register function and switched to hash table - rpc switched to hashtable - added rpc register function, that can be called from modules not using ser module interface (e.g. kamailio or future sip-router module interface). --- core_cmd.c | 78 ++++++++++---------- core_cmd.h | 3 +- main.c | 3 + rpc_lookup.c | 220 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ rpc_lookup.h | 46 ++++++++++++ sr_module.c | 43 ++++------- 6 files changed, 325 insertions(+), 68 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=509…

1 0

git:master: lcr: added ser RPC support
by Andrei Pelinescu-Onciul 13 May '09

13 May '09

Module: sip-router Branch: master Commit: 826d4a56f2ffb95bb7d23886e3e4248eee9147fa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=826d4a5… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed May 13 13:52:51 2009 +0200 lcr: added ser RPC support - copied & adapted lcr_rpc.[ch] from the ser version of lcr. - register the rpc array from mod_init if RPC_SUPPORT is defined (defined by default in lcr_rpc.h unless lcr is compiled with -DNO_RPC_SUPPORT). - init db for all the children if RPC_SUPPORT is defined (needed for xmlrpc which does not run in a separate process) - moved some defines, structs and typedefs from lcr_mod.c to lcr_mod.h. --- modules/lcr/lcr_mod.c | 62 ++++++++++++-------- modules/lcr/lcr_mod.h | 27 ++++++++ modules/lcr/lcr_rpc.c | 158 +++++++++++++++++++++++++++++++++++++++++++++++++ modules/lcr/lcr_rpc.h | 43 +++++++++++++ 4 files changed, 265 insertions(+), 25 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=826…

1 0

git:master: doc: rpc doc updated
by Andrei Pelinescu-Onciul 13 May '09

13 May '09

Module: sip-router Branch: master Commit: 412bfde5e10fdb14d73bcb6482a23d741db0932a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=412bfde… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed May 13 13:49:51 2009 +0200 doc: rpc doc updated - added rpc_register_array(rpc_export_array) - added rpc_register(rcp_export) - regenerated ser_rpc.txt --- doc/rpc/ser_rpc.txt | 95 ++++++++++++++++++++++------------- doc/rpc/ser_rpc.xml | 138 +++++++++++++++++++++++++++++++++++---------------- 2 files changed, 155 insertions(+), 78 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=412…

1 0

git:master: @ruri.rn_user is introduced.
by Miklos Tirpak 13 May '09

13 May '09

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},

1 0

git:master: Merge branch 'master' of ssh://tirpi@git.sip-router.org/ sip-router
by Miklos Tirpak 13 May '09

13 May '09

Module: sip-router Branch: master Commit: 5268631faf47a858ff7bc5b7e7c7b952b28218f9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5268631… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed May 13 17:05:31 2009 +0200 Merge branch 'master' of ssh://tirpi@git.sip-router.org/sip-router * 'master' of ssh://tirpi@git.sip-router.org/sip-router: refine registrar tests, bug #2790184, port from kamailio r5837 ---

1 0

git:master: @ruri.params["foo"] checks also the original sip: URI parameters
by Miklos Tirpak 13 May '09

13 May '09

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)

2 1

git:master: refine registrar tests, bug #2790184, port from kamailio r5837
by Henning Westerholt 13 May '09

13 May '09

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"); }

1 0

git:master: Merge branch 'master' of ssh://tirpi@git.sip-router.org/ sip-router
by Miklos Tirpak 13 May '09

13 May '09

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 ---

1 0

git:master: * Fixed pua module memory leak. Credits to Anca Vamanu.
by Juha Heinanen 13 May '09

13 May '09

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)

1 0

git:master: fix k bug #2790184, crash related to uninitialized match_callid parameter
by Henning Westerholt 13 May '09

13 May '09

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) {

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
27
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2009