sr-dev June 2009

sr-dev@lists.kamailio.org

33 participants
284 discussions

git:master: mi_rpc: new module - rpc command to execute MI commands
by Daniel-Constantin Mierla 01 Jul '09

01 Jul '09

Module: sip-router Branch: master Commit: 1f0341882763c34493f0ff5e6ab7dd4f5b4ff992 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1f03418… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jun 28 12:53:27 2009 +0200 mi_rpc: new module - rpc command to execute MI commands - 'mi' rpc command can be used to execute K MI commands - example using sercmd: sercmd> mi uptime 200 OK + Now:: Sun Jun 28 12:45:37 2009 + Up since:: Sun Jun 28 12:24:27 2009 + Up time:: 1270 [sec] --- modules/mi_rpc/Makefile | 18 +++ modules/mi_rpc/README | 84 +++++++++++++ modules/mi_rpc/doc/Makefile | 4 + modules/mi_rpc/doc/mi_rpc.xml | 43 +++++++ modules/mi_rpc/doc/mi_rpc_admin.xml | 103 ++++++++++++++++ modules/mi_rpc/mi_rpc_mod.c | 228 +++++++++++++++++++++++++++++++++++ 6 files changed, 480 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=1f0…

3 5

git:daniel/xavp: core: introducing xavp (eXtended AVP)
by Daniel-Constantin Mierla 01 Jul '09

01 Jul '09

Module: sip-router Branch: daniel/xavp Commit: ef79b7beb75f3f4ed3a5fa1ba6c76363dc254e3e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ef79b7b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jun 30 12:26:56 2009 +0200 core: introducing xavp (eXtended AVP) - design: - one master list stored in core - internal integer id to optimise the search in list (hash value over the string name) - name stored as str and null terminated (can use regexp over it) - string values stored as str and null terminated - other types of value that can be used internally (not in config) - long - long long - time - xavp (or list of xavp) - generic data structure - for more see: http://sip-router.org/wiki/devel/xavp - NOTE: this is not a replacement for existing AVPs, but an add-on, a new pseudo-variable class --- xavp.c | 508 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ xavp.h | 95 ++++++++++++ 2 files changed, 603 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ef7…

2 1

git:master: domain: init db connection for RPC process
by Daniel-Constantin Mierla 30 Jun '09

30 Jun '09

Module: sip-router Branch: master Commit: d60f872ac4ae3b656585ceac69c15d536131ec92 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d60f872… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jul 1 00:10:22 2009 +0200 domain: init db connection for RPC process - make mi commands to work properly via RPC interface - reported by Juha Heinanen --- modules_k/domain/domain_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/domain/domain_mod.c b/modules_k/domain/domain_mod.c index 0054181..431f5ab 100644 --- a/modules_k/domain/domain_mod.c +++ b/modules_k/domain/domain_mod.c @@ -212,7 +212,7 @@ error: static int child_init(int rank) { /* Check if database is needed by child */ - if ( db_mode==0 && rank>0 ) { + if ( (db_mode==0 && rank>0) || (rank==PROC_RPC) ) { if (domain_db_init(&db_url)<0) { LM_ERR("Unable to connect to the database\n"); return -1;

1 0

git:master: presence: use event name from parsed structure
by Daniel-Constantin Mierla 30 Jun '09

30 Jun '09

Module: sip-router Branch: master Commit: 602552de12720c9ab57eea1b33958953f1dfd336 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=602552d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jun 30 22:26:32 2009 +0200 presence: use event name from parsed structure - event name is taken from event_t as the given value might have parameters - wipeer search uses above mentioned name - fill given parameter in contains_event() instead of local var and then copy --- modules_k/presence/event_list.c | 54 +++++++++++++++++++++++---------------- 1 files changed, 32 insertions(+), 22 deletions(-) diff --git a/modules_k/presence/event_list.c b/modules_k/presence/event_list.c index d6957c3..1ccf39b 100644 --- a/modules_k/presence/event_list.c +++ b/modules_k/presence/event_list.c @@ -159,7 +159,6 @@ int add_event(pres_ev_t* event) ev->name.s= (char*)shm_malloc(event->name.len* sizeof(char)); if(ev->name.s== NULL) { - free_event_params(parsed_event.params.list, PKG_MEM_TYPE); ERR_MEM(SHARE_MEM); } memcpy(ev->name.s, event->name.s, event->name.len); @@ -169,22 +168,20 @@ int add_event(pres_ev_t* event) if(ev->evp== NULL) { LM_ERR("copying event_t structure\n"); - free_event_params(parsed_event.params.list, PKG_MEM_TYPE); goto error; } - free_event_params(parsed_event.params.list, PKG_MEM_TYPE); } else { - free_event_params(parsed_event.params.list, PKG_MEM_TYPE); if(ev->content_type.s) { LM_DBG("Event already registered\n"); - return 0; + goto done; } } - ev->content_type.s=(char*)shm_malloc(event->content_type.len* sizeof(char)) ; + ev->content_type.s= + (char*)shm_malloc(event->content_type.len* sizeof(char)) ; if(ev->content_type.s== NULL) { ERR_MEM(SHARE_MEM); @@ -192,32 +189,39 @@ int add_event(pres_ev_t* event) ev->content_type.len= event->content_type.len; memcpy(ev->content_type.s, event->content_type.s, event->content_type.len); - sep= strchr(event->name.s, '.'); + for(sep=parsed_event.name.s; sep<parsed_event.name.s+parsed_event.name.len; + sep++) + if(*sep=='.') break; + if(sep>=parsed_event.name.s+parsed_event.name.len) sep=0; if(sep && strncmp(sep+1, "winfo", 5)== 0) { ev->type= WINFO_TYPE; - wipeer_name.s= event->name.s; - wipeer_name.len= sep - event->name.s; + wipeer_name.s= parsed_event.name.s; + wipeer_name.len= sep - parsed_event.name.s; ev->wipeer= contains_event(&wipeer_name, NULL); if (ev->wipeer) { - LM_DBG("Found wipeer event [%.*s] for event [%.*s]\n",wipeer_name.len,wipeer_name.s,event->name.len,event->name.s); + LM_DBG("Found wipeer event [%.*s] for event [%.*s]\n", + wipeer_name.len,wipeer_name.s, + parsed_event.name.len,parsed_event.name.s); } } else { ev->type= PUBL_TYPE; - if (event->name.len + 6 > 50) { + if (parsed_event.name.len + 6 > 50) { LM_ERR("buffer too small\n"); goto error; } wipeer_name.s= buf; - memcpy(wipeer_name.s, event->name.s, event->name.len); - wipeer_name.len= event->name.len; + memcpy(wipeer_name.s, parsed_event.name.s, parsed_event.name.len); + wipeer_name.len= parsed_event.name.len; memcpy(wipeer_name.s+ wipeer_name.len, ".winfo", 6); wipeer_name.len+= 6; ev->wipeer= contains_event(&wipeer_name, NULL); if (ev->wipeer) { - LM_DBG("Found wipeer event [%.*s] for event [%.*s]\n",wipeer_name.len,wipeer_name.s,event->name.len,event->name.s); + LM_DBG("Found wipeer event [%.*s] for event [%.*s]\n", + wipeer_name.len,wipeer_name.s, + parsed_event.name.len,parsed_event.name.s); } } @@ -251,8 +255,11 @@ int add_event(pres_ev_t* event) LM_DBG("succesfully added event: %.*s - len= %d\n",ev->name.len, ev->name.s, ev->name.len); +done: + free_event_params(parsed_event.params.list, PKG_MEM_TYPE); return 0; error: + free_event_params(parsed_event.params.list, PKG_MEM_TYPE); if(ev && not_in_list) { free_pres_event(ev); @@ -295,21 +302,23 @@ evlist_t* init_evlist(void) pres_ev_t* contains_event(str* sname, event_t* parsed_event) { event_t event; + event_t *pe; pres_ev_t* e; - memset(&event, 0, sizeof(event_t)); - if(event_parser(sname->s, sname->len, &event)< 0) + pe = (parsed_event)?parsed_event:&event; + + memset(pe, 0, sizeof(event_t)); + if(event_parser(sname->s, sname->len, pe)< 0) { LM_ERR("parsing event\n"); return NULL; } - if(parsed_event) - *parsed_event= event; - else + e= search_event(pe); + if(parsed_event==0) { - free_event_params(event.params.list, PKG_MEM_TYPE); + free_event_params(pe->params.list, PKG_MEM_TYPE); + pe->params.list = NULL; } - e= search_event(&event); return e; } @@ -336,7 +345,8 @@ pres_ev_t* search_event(event_t* event) pres_ev_t* pres_ev; pres_ev= EvList->events; - LM_DBG("start event= [%.*s]\n", event->name.len, event->name.s); + LM_DBG("start event= [%.*s/%d]\n", event->name.len, event->name.s, + event->type); while(pres_ev) {

1 0

git:master: core: parse_event - skip first ; for parameters
by Daniel-Constantin Mierla 30 Jun '09

30 Jun '09

Module: sip-router Branch: master Commit: 10e82c040dbf2ca5a3b200b2b232b9c362092706 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=10e82c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jun 30 22:18:52 2009 +0200 core: parse_event - skip first ; for parameters - skip ; after event body - event debug function prints to stderr since stdout is closed --- parser/parse_event.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/parser/parse_event.c b/parser/parse_event.c index 98ca5e5..3d4b6b2 100644 --- a/parser/parse_event.c +++ b/parser/parse_event.c @@ -119,6 +119,8 @@ int event_parser(char* s, int len, event_t* e) if (tmp.s[0] == ';') { /* We have parameters to parse */ + tmp.s++; + tmp.len--; if (e->type == EVENT_DIALOG) { pclass = CLASS_EVENT_DIALOG; phooks = (param_hooks_t*)&e->params.dialog; @@ -184,11 +186,11 @@ void free_event(event_t** _e) */ void print_event(event_t* e) { - printf("===Event===\n"); - printf("name : \'%.*s\'\n", STR_FMT(&e->name)); - printf("type: %d\n", e->type); + fprintf(stderr, "===Event===\n"); + fprintf(stderr, "name : \'%.*s\'\n", STR_FMT(&e->name)); + fprintf(stderr, "type: %d\n", e->type); if (e->params.list) { - print_params(stdout, e->params.list); + print_params(stderr, e->params.list); } - printf("===/Event===\n"); + fprintf(stderr, "===/Event===\n"); }

1 0

git:rbetancor/drouting: * core
by Raul Alexis Betancor Santana 30 Jun '09

30 Jun '09

Module: sip-router Branch: rbetancor/drouting Commit: 1c5d19277a14e71167c81665d6de8173e61a2ccb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c5d192… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Jun 19 16:40:24 2009 +0300 * core * Added fixup_igp_pvar and fixup_free_igp_pvar fixup functions. --- mod_fix.c | 1 + mod_fix.h | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/mod_fix.c b/mod_fix.c index a228e16..90a4a4d 100644 --- a/mod_fix.c +++ b/mod_fix.c @@ -176,6 +176,7 @@ FIXUP_F2T(pvar_str_str, 1, 3, 1, FPARAM_PVS, FPARAM_STR) FIXUP_F2FP(igp_null, 1, 1, 1, FPARAM_INT|FPARAM_PVS, 0) FIXUP_F2FP(igp_igp, 1, 2, 2, FPARAM_INT|FPARAM_PVS, 0) +FIXUP_F2FP(igp_pvar, 1, 2, 1, FPARAM_INT|FPARAM_PVS, FPARAM_PVS) FIXUP_F2FP_T(igp_pvar_pvar, 1, 3, 1, FPARAM_INT|FPARAM_PVS, FPARAM_PVS) diff --git a/mod_fix.h b/mod_fix.h index 257d78c..37bccb6 100644 --- a/mod_fix.h +++ b/mod_fix.h @@ -109,6 +109,9 @@ int fixup_igp_igp(void** param, int param_no); int fixup_igp_null(void** param, int param_no); int fixup_get_ivalue(struct sip_msg* msg, gparam_p gp, int *val); +int fixup_igp_pvar(void** param, int param_no); +int fixup_free_igp_pvar(void** param, int param_no); + int fixup_igp_pvar_pvar(void** param, int param_no); int fixup_free_igp_pvar_pvar(void** param, int param_no);

5 10

git:master: select_core: fix @ruri.rn_user moving parsed ptr
by Michal Matyska 30 Jun '09

30 Jun '09

Module: sip-router Branch: master Commit: 21ba29a12f505b107ef4fb70d74bff6df02acc7b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=21ba29a… Author: Michal Matyska <michal.matyska(a)iptel.org> Committer: Michal Matyska <michal.matyska(a)iptel.org> Date: Tue Jun 30 17:44:54 2009 +0200 select_core: fix @ruri.rn_user moving parsed ptr - changed str* to str parameter type in search_param function to keep value of the parameter intact upon function return, otherwise the function moved the ptr to the beginning of the rn parameter or at the end of the pameters string. --- select_core.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/select_core.c b/select_core.c index 4cc32f1..3aece91 100644 --- a/select_core.c +++ b/select_core.c @@ -801,16 +801,16 @@ int select_uri_user(str* res, select_t* s, struct sip_msg* msg) * * val is set to the value of the parameter. */ -static inline int search_param(str *params, char *name, int name_len, +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) + if (params.s == NULL) return 0; - if (parse_params(params, CLASS_ANY, &h, &list) < 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) @@ -840,12 +840,12 @@ int select_uri_rn_user(str* res, select_t* s, struct sip_msg* msg) } /* search for the "rn" parameter */ - if ((ret = search_param(&select_uri_p->params, "rn", 2, &val)) != 0) + if ((ret = search_param(select_uri_p->params, "rn", 2, &val)) != 0) goto done; if (select_uri_p->sip_params.s != select_uri_p->params.s) { /* check also the original sip: URI parameters */ - if ((ret = search_param(&select_uri_p->sip_params, "rn", 2, &val)) != 0) + if ((ret = search_param(select_uri_p->sip_params, "rn", 2, &val)) != 0) goto done; } @@ -1015,7 +1015,7 @@ int select_any_params(str* res, select_t* s, struct sip_msg* msg) if (!res->len) return -1; - if (search_param(res, wanted->s, wanted->len, res) <= 0) { + if (search_param(*res, wanted->s, wanted->len, res) <= 0) { DBG("SELECT ...uri.params.%s NOT FOUND !\n", wanted->s); return -1; } else {

1 0

git:master: Merge branch 'master' of ssh://mma@git.sip-router.org/ sip-router
by Michal Matyska 30 Jun '09

30 Jun '09

Module: sip-router Branch: master Commit: b7d3c7eafb994c768f4b7768b3e3f2fa93550819 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b7d3c7e… Author: Michal Matyska <michal.matyska(a)iptel.org> Committer: Michal Matyska <michal.matyska(a)iptel.org> Date: Tue Jun 30 17:53:50 2009 +0200 Merge branch 'master' of ssh://mma@git.sip-router.org/sip-router ---

1 0

git:master: modules/lcr: fixed printing of lcr_id by lcr.dump_lcrs
by Juha Heinanen 30 Jun '09

30 Jun '09

Module: sip-router Branch: master Commit: d99a4102bc1314e45185f84bd0daecd7d73c8dc3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d99a410… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Jun 30 17:41:22 2009 +0300 modules/lcr: fixed printing of lcr_id by lcr.dump_lcrs - Fixed printing of lcr_id by lcr.dump_lcrs command. --- modules/lcr/lcr_rpc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/lcr/lcr_rpc.c b/modules/lcr/lcr_rpc.c index ef3d2f2..d9f5e72 100644 --- a/modules/lcr/lcr_rpc.c +++ b/modules/lcr/lcr_rpc.c @@ -148,7 +148,7 @@ static void dump_lcrs(rpc_t* rpc, void* c) from_uri.s=lcr_rec->from_uri; from_uri.len=lcr_rec->from_uri_len; rpc->struct_add(st, "dSSdd", - "lcr_id", &lcr_id, + "lcr_id", j, "prefix", &prefix, "from_uri", &from_uri, "grp_id", lcr_rec->grp_id,

1 0

SF.net SVN: openser:[5886] branches
by Henning Westerholt 30 Jun '09

30 Jun '09

Revision: 5886 http://openser.svn.sourceforge.net/openser/?rev=5886&view=rev Author: henningw Date: 2009-06-30 14:34:58 +0000 (Tue, 30 Jun 2009) Log Message: ----------- - update Changelogs Modified Paths: -------------- branches/1.3/ChangeLog branches/1.4/ChangeLog branches/1.5/ChangeLog This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2009