sr-dev March 2011

sr-dev@lists.kamailio.org

25 participants
194 discussions

git:master: version increased to 3.2.0-dev4

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 5a264ce3401c1aab4ac0ef6a6d0cbfe7d8b995f0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5a264ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Mar 26 14:21:39 2011 +0100 version increased to 3.2.0-dev4 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 90d3c09..d1fce21 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -162,7 +162,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 3 PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -dev3 +EXTRAVERSION = -dev4 # memory debugger switcher # 0 - off (release mode)

13 years, 8 months

git:master: must not call restore_db_subs for DB_ONLY mode

by Marius Ovidiu Bucur

Module: sip-router Branch: master Commit: 289d7c06a6f2b130860848e82e10c87a710c8cce URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=289d7c0… Author: mariusb <mariusb(a)ubuntu.(none)> Committer: mariusb <mariusb(a)ubuntu.(none)> Date: Sat Mar 26 12:54:37 2011 +0200 must not call restore_db_subs for DB_ONLY mode --- modules_k/presence/presence.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules_k/presence/presence.c b/modules_k/presence/presence.c index 2a9381d..a1cb13f 100644 --- a/modules_k/presence/presence.c +++ b/modules_k/presence/presence.c @@ -323,10 +323,13 @@ static int mod_init(void) return -1; } - if(restore_db_subs()< 0) + if(dbmode != DB_ONLY) { - LM_ERR("restoring subscribe info from database\n"); - return -1; + if(restore_db_subs()< 0) + { + LM_ERR("restoring subscribe info from database\n"); + return -1; + } } if(phtable_size< 1)

13 years, 8 months

git:master: tm: enforce AVP_TRACK_TO only for ser-style timer AVPs

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 26f757d0c30db79c92011313e72c6c1d97e64cd0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=26f757d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Mar 24 23:06:17 2011 +0100 tm: enforce AVP_TRACK_TO only for ser-style timer AVPs - ser used the list of AVPs from track To for geting timer values - kamailio is using mainly track From for AVPs - for compatibility reasons, if avp name is given in ser style, enforce AVPs track To, otherwise use default track (From) if none is specified - reported by Min Wang --- modules/tm/t_funcs.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_funcs.c b/modules/tm/t_funcs.c index 13e3952..1b43cc1 100644 --- a/modules/tm/t_funcs.c +++ b/modules/tm/t_funcs.c @@ -431,6 +431,8 @@ int init_avp_params(char *fr_timer_param, char *fr_inv_timer_param, "AVP specs \"%s\"\n", fr_timer_param); return -1; } + /* ser flavour uses the To track of AVPs */ + fr_timer_avp_type |= AVP_TRACK_TO; } } @@ -462,6 +464,8 @@ int init_avp_params(char *fr_timer_param, char *fr_inv_timer_param, "AVP specs \"%s\"\n", fr_inv_timer_param); return -1; } + /* ser flavour uses the To track of AVPs */ + fr_inv_timer_avp_type |= AVP_TRACK_TO; } } @@ -507,7 +511,7 @@ static inline int avp2timer(unsigned int* timer, int type, int_str name) int_str val_istr; int err; - avp = search_first_avp( type | AVP_TRACK_TO, name, &val_istr, 0); + avp = search_first_avp(type, name, &val_istr, 0); if (!avp) { /* DBG("avp2timer: AVP '%.*s' not found\n", param.s->len, ZSW(param.s->s));

13 years, 8 months

git:carstenbock/ims: - add Call-ID instead of Pointer to internal structure in Publish

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: 939192de653b86dd49169c50f05e0bc6d8c7eefa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=939192d… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Mar 24 10:50:51 2011 +0100 - add Call-ID instead of Pointer to internal structure in Publish --- modules_k/pua_reginfo/usrloc_cb.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/modules_k/pua_reginfo/usrloc_cb.c b/modules_k/pua_reginfo/usrloc_cb.c index 5603fac..c2bd689 100644 --- a/modules_k/pua_reginfo/usrloc_cb.c +++ b/modules_k/pua_reginfo/usrloc_cb.c @@ -113,8 +113,7 @@ str* build_reginfo_full(urecord_t * record, str uri, ucontact_t* c, int type) { LM_ERR("while adding child\n"); goto error; } - buf_len = snprintf(buf, sizeof(buf), "%p", ptr); - xmlNewProp(contact_node, BAD_CAST "id", BAD_CAST buf); + xmlNewProp(contact_node, BAD_CAST "id", BAD_CAST ptr->callid.s); /* Check, if this is the modified contact: */ if (ptr == c) { if ((type & UL_CONTACT_INSERT) || (type & UL_CONTACT_UPDATE))

13 years, 8 months

git:carstenbock/ims: - added message Parser for processing the XML in the NOTIFY

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: 8507f1b5274fd0ccaf887ef45561f18f5cf3d670 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8507f1b… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Mar 24 15:36:58 2011 +0100 - added message Parser for processing the XML in the NOTIFY - several minor bugfixes (e.g. the Call-ID must be zero terminated) --- modules_k/pua_reginfo/notify.c | 230 ++++++++++++++++++++++++++++++++++- modules_k/pua_reginfo/pua_reginfo.c | 44 +++++-- modules_k/pua_reginfo/subscribe.c | 3 +- modules_k/pua_reginfo/usrloc_cb.c | 2 + 4 files changed, 265 insertions(+), 14 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=850…

13 years, 8 months

Debugging non existing pvar

by Mino Haluz

Hi, we are encountering weird error with "non existing right pvar" - unexpectedly and we have already given up to debug it normally (calls are ended by Forbidden). We would like to adjust the code, to get the specific line of configuration file, where this occurs. Running kamailio with debug parameters is not acceptable, as we have too many calls and searching for the error would last some time ... Could you somebody please help me to adjust this code (lvalue.c) , that could give us some additional information except for "non existing right pvar" thing in syslog? line of conf file, or simply the name of the variable assigned, value, etc. Thank you. Error msg is generated on the line 351, and maybe 207, really don't know. lvalue.c:207 }else{ /* non existing pvar */ /* on error, keep the type of the assigned avp, but reset it to an empty value */ AVP_ASSIGN_NOVAL(); ret=0; } break; lvalue.c:351 }else{ ERR("non existing right pvar\n"); PVAR_ASSIGN_NOVAL(); ret=-1; } break;

13 years, 8 months

compilation warning

by Juha Heinanen

today i compiled sip router from master and got this: CC (cc) [M sqlops.so] sqlops.o sqlops.c: In function ‘sql_xquery’: sqlops.c:201: warning: passing argument 3 of ‘sql_do_xquery’ from incompatible pointer type sql_api.h:77: note: expected ‘struct pv_elem_t *’ but argument is of type ‘char *’ please fix. -- juha

13 years, 8 months

git:master: modules_k/sqlops: cast the query parameter of sql_do_xquery() to the right type.

by Alex Hermann

Module: sip-router Branch: master Commit: c1c19d849d85b4389c9fa88f83c31af5c7173b8f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c1c19d8… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Thu Mar 24 09:55:34 2011 +0100 modules_k/sqlops: cast the query parameter of sql_do_xquery() to the right type. --- modules_k/sqlops/sqlops.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/sqlops/sqlops.c b/modules_k/sqlops/sqlops.c index a03b7b5..6d04e4b 100644 --- a/modules_k/sqlops/sqlops.c +++ b/modules_k/sqlops/sqlops.c @@ -198,7 +198,7 @@ static int sql_query(struct sip_msg *msg, char *dbl, char *query, char *res) */ static int sql_xquery(struct sip_msg *msg, char *dbl, char *query, char *res) { - return sql_do_xquery(msg, (sql_con_t*)dbl, query, (pv_elem_t*)res); + return sql_do_xquery(msg, (sql_con_t*)dbl, (pv_elem_t*)query, (pv_elem_t*)res); } #endif

13 years, 8 months

git:carstenbock/ims: - minor fixes for presence_reginfo-Module

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: b8fe18bf2c3672f0cc5b481571927552e815fc45 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b8fe18b… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Mar 24 00:42:52 2011 +0100 - minor fixes for presence_reginfo-Module --- modules_k/presence_reginfo/add_events.c | 2 +- modules_k/presence_reginfo/presence_reginfo.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/presence_reginfo/add_events.c b/modules_k/presence_reginfo/add_events.c index 67f62b8..f30ef16 100644 --- a/modules_k/presence_reginfo/add_events.c +++ b/modules_k/presence_reginfo/add_events.c @@ -35,7 +35,7 @@ int reginfo_add_events(void) /* constructing message-summary event */ memset(&event, 0, sizeof(pres_ev_t)); event.name.s = "reg"; - event.name.len = 6; + event.name.len = 3; event.content_type.s = "application/reginfo+xml"; event.content_type.len = 23; diff --git a/modules_k/presence_reginfo/presence_reginfo.c b/modules_k/presence_reginfo/presence_reginfo.c index 8a5cff9..d3bbcb4 100644 --- a/modules_k/presence_reginfo/presence_reginfo.c +++ b/modules_k/presence_reginfo/presence_reginfo.c @@ -76,7 +76,7 @@ static int mod_init(void) return -1; } if (bind_presence(&pres) < 0) { - LM_ERR("can't bind pua\n"); + LM_ERR("can't bind presence\n"); return -1; } @@ -86,7 +86,7 @@ static int mod_init(void) return -1; } if(reginfo_add_events() < 0) { - LM_ERR("failed to add dialog-info events\n"); + LM_ERR("failed to add reginfo-info events\n"); return -1; }

13 years, 8 months

git:carstenbock/ims: - add a parameter to disable the setting of a version in the XML of reginfo-XML 's

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: b0be0501a1812cea565af9e3c93c7970642fb135 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b0be050… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Mar 24 00:40:45 2011 +0100 - add a parameter to disable the setting of a version in the XML of reginfo-XML's --- modules_k/pua/add_events.c | 13 ++++++++++--- modules_k/pua/doc/pua_admin.xml | 26 ++++++++++++++++++++++++++ modules_k/pua/pua.c | 2 ++ modules_k/pua/pua.h | 2 ++ 4 files changed, 40 insertions(+), 3 deletions(-) diff --git a/modules_k/pua/add_events.c b/modules_k/pua/add_events.c index f285161..76a12db 100644 --- a/modules_k/pua/add_events.c +++ b/modules_k/pua/add_events.c @@ -86,9 +86,16 @@ int pua_add_events(void) } /* add application/reginfo+xml */ - if(add_pua_event(REGINFO_EVENT, "reg", "application/reginfo+xml", reginfo_process_body)< 0) { - LM_ERR("while adding event application/reginfo+xml\n"); - return -1; + if (dlginfo_increase_version) { + if(add_pua_event(REGINFO_EVENT, "reg", "application/reginfo+xml", reginfo_process_body)< 0) { + LM_ERR("while adding event application/reginfo+xml with version increase\n"); + return -1; + } + } else { + if(add_pua_event(REGINFO_EVENT, "reg", "application/reginfo+xml", dlg_process_body)< 0) { + LM_ERR("while adding event application/reginfo+xml\n"); + return -1; + } } return 0; diff --git a/modules_k/pua/doc/pua_admin.xml b/modules_k/pua/doc/pua_admin.xml index 981dcf2..0868de4 100644 --- a/modules_k/pua/doc/pua_admin.xml +++ b/modules_k/pua/doc/pua_admin.xml @@ -233,6 +233,32 @@ modparam("pua", "dlginfo_increase_version", 1) </programlisting> </example> </section> + <section> + <title><varname>reginfo_increase_version</varname> (int)</title> + <para> + When sending PUBLISHs for Event: reg, the body contains an + XML document according to RFC 4235(?). This XML document contains a + version attribute to easily detect changes in the registration state. + By setting this parameter, the pua module parses the XML document and + sets the version attribute to the proper value. If the receiver of + the PUBLISH does not care about the version parameter (e.g. like + &kamailio; presence_reginfo module) it makes no sense to waste + CPU resources for parsing the XML body and the parameter should be + set to 0. + </para> + <para> + <emphasis>Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>reginfo_increase_version</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("pua", "reginfo_increase_version", 1) +... +</programlisting> + </example> + </section> </section> <section> diff --git a/modules_k/pua/pua.c b/modules_k/pua/pua.c index bf73187..6600a98 100644 --- a/modules_k/pua/pua.c +++ b/modules_k/pua/pua.c @@ -67,6 +67,7 @@ int update_period= 100; str outbound_proxy = {0, 0}; int startup_time = 0; int dlginfo_increase_version = 0; +int reginfo_increase_version = 0; pua_event_t* pua_evlist= NULL; /* database connection */ @@ -123,6 +124,7 @@ static param_export_t params[]={ {"update_period", INT_PARAM, &update_period }, {"outbound_proxy", STR_PARAM, &outbound_proxy.s }, {"dlginfo_increase_version", INT_PARAM, &dlginfo_increase_version}, + {"reginfo_increase_version", INT_PARAM, &reginfo_increase_version}, {0, 0, 0 } }; diff --git a/modules_k/pua/pua.h b/modules_k/pua/pua.h index 19e59ec..3db757a 100644 --- a/modules_k/pua/pua.h +++ b/modules_k/pua/pua.h @@ -43,4 +43,6 @@ extern int pua_ul_publish; extern int default_expires; extern str outbound_proxy; +int reginfo_increase_version; + #endif

13 years, 8 months

← Newer
1
...
4
5
6
7
8
9
10
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2011