sr-dev August 2014

sr-dev@lists.kamailio.org

25 participants
195 discussions

by Daniel-Constantin Mierla

Hello, I am considering to release v4.1.5 sometime next week, most likely on the 6th of August. Checking the 4.1 branch, there are not many fixes, few are on my list for backporting. That's good, indicating a high level of stability. If anyone is aware of issues not reported on tracker or patches that have not been backported, add to the tracker or write a message to sr-dev mailing list. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

9 years, 9 months

no fork mode and more than one listen address found (will use only the first one)

by Yuriy Gorlichenko

Hello. I Installed kamailio 4.1.4, when I starting my server I see following Warning no fork mode and more than one listen address found (will use only the first one) I found the same issue at this mailing list http://comments.gmane.org/gmane.comp.voip.openser.user/10686 I need start only main process as foreground. Other processes must bee at the fork mode. I search analog implementation of patch that was created at 2007) But it very old issue (2007 year) and I think patch at this issue does not help me. I need implementation of this issue for kamailio 4.1.4. Thanks

9 years, 9 months

git:master: ims_usrloc_scscf: In case the contact_id after insert_update is 0, do the old query again ( last_inserted_id is only set, if there was really an UPDATE or INSERT, not if nothing was changed)

by Carsten Bock

Module: sip-router Branch: master Commit: 7b7754a41711aa09d63d219c3930dc5090eaf326 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7b7754a… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Tue Aug 5 17:21:06 2014 +0200 ims_usrloc_scscf: In case the contact_id after insert_update is 0, do the old query again (last_inserted_id is only set, if there was really an UPDATE or INSERT, not if nothing was changed) --- modules/ims_usrloc_scscf/usrloc_db.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/modules/ims_usrloc_scscf/usrloc_db.c b/modules/ims_usrloc_scscf/usrloc_db.c index 49b551b..c25e89c 100644 --- a/modules/ims_usrloc_scscf/usrloc_db.c +++ b/modules/ims_usrloc_scscf/usrloc_db.c @@ -252,6 +252,29 @@ int db_insert_ucontact(impurecord_t* _r, ucontact_t* _c) { return -1; } contact_id = ul_dbf.last_inserted_id(ul_dbh); + if (contact_id <= 0) { + /* search for the ID if the contact just entered */ + if (ul_dbf.query(ul_dbh, key, 0, val, key_return, 1, 1, NULL, &_rs) != 0) { + LM_ERR("Unable to find contact [%.*s] in DB to complete IMPU-contact mapping\n", _c->c.len, _c->c.s); + ul_dbf.free_result(ul_dbh, _rs); + return -1; + } + + if (RES_ROW_N(_rs) == 0) { + LM_DBG("Contact %.*s not found in DB\n",_c->c.len, _c->c.s); + ul_dbf.free_result(ul_dbh, _rs); + return -1; + } + + if (RES_ROW_N(_rs) > 1) { + LM_WARN("more than one contact found in DB for contact [%.*s] - this should not happen... proceeding with first entry\n", + _c->c.len, _c->c.s); + } + + ret_val = ROW_VALUES(RES_ROWS(_rs)); + contact_id = ret_val[0].val.int_val; + ul_dbf.free_result(ul_dbh, _rs); + } LM_DBG("contact ID is %d\n", contact_id); /* search for ID of the associated IMPU */

9 years, 9 months

git:4.1: pua_xmpp: fixed wrong define guardian id

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: 190eb31d662462b6d3a44d81389500f935d28a70 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=190eb31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Aug 5 13:10:34 2014 +0200 pua_xmpp: fixed wrong define guardian id (cherry picked from commit 6b833a82cb8c0978fae54afa086eff6d5479fa17) --- modules/pua_xmpp/simple2xmpp.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/pua_xmpp/simple2xmpp.h b/modules/pua_xmpp/simple2xmpp.h index 2178e0a..d38acf5 100644 --- a/modules/pua_xmpp/simple2xmpp.h +++ b/modules/pua_xmpp/simple2xmpp.h @@ -27,7 +27,7 @@ */ #ifndef SIP_XMPP_PRES_H -#define SIP_XMPP__PRES_H +#define SIP_XMPP_PRES_H #include "../pua/pua_bind.h"

9 years, 9 months

git:4.1: pua: solved warning on comparing unsigned expression

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: f83b5bc97f991bf357545b2fe10fa84725d24f9e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f83b5bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Aug 5 13:09:16 2014 +0200 pua: solved warning on comparing unsigned expression (cherry picked from commit 55b42c5ba9e78b1d6662d45f1b68898bc67548c9) --- modules/pua/pua.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/pua/pua.c b/modules/pua/pua.c index 900e582..1e85938 100644 --- a/modules/pua/pua.c +++ b/modules/pua/pua.c @@ -993,7 +993,7 @@ static void db_update(unsigned int ticks,void *param) p = HashT->p_records[i].entity->next; while(p) { - if(p->expires - (int)time(NULL)< 0) + if((int)p->expires - (int)time(NULL)< 0) { p= p->next; continue;

9 years, 9 months

git:4.1: msilo: check if the register has contacts with positive expires value

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: 80ea39b93278e99b32e6d16f6bb76fefad3d691f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=80ea39b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 21 10:10:45 2014 +0200 msilo: check if the register has contacts with positive expires value - otherwise is un-registration and no new contact to dump messages - reported by Anthony Messina (cherry picked from commit 6559c4383858d472637807c6ec4dd1e0616507fa) --- modules/msilo/msilo.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/modules/msilo/msilo.c b/modules/msilo/msilo.c index 903b3cf..e535491 100644 --- a/modules/msilo/msilo.c +++ b/modules/msilo/msilo.c @@ -1534,6 +1534,7 @@ int check_message_support(struct sip_msg* msg) str *methods_body; unsigned int methods; int expires; + int posexp = 0; /* Parse all headers in order to see all Allow headers */ if (parse_headers(msg, HDR_EOH_F, 0) == -1) @@ -1587,6 +1588,7 @@ int check_message_support(struct sip_msg* msg) /* skip contacts with zero expires */ if (expires > 0) { + posexp = 1; if (c->methods) { methods_body = &(c->methods->body); @@ -1614,6 +1616,11 @@ int check_message_support(struct sip_msg* msg) return -1; } } + + /* no positivie expires header */ + if(posexp==0) + return -1; + /* no Allow header and no methods in Contact => dump MESSAGEs */ if(allow_hdr==0) return 0;

9 years, 9 months

git:4.1: usrloc: refresh call-id value in case of update of location record

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: 8671ba9b2c1626247d777c1d6fcbe25966d465da URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8671ba9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 17 19:13:42 2014 +0200 usrloc: refresh call-id value in case of update of location record - related to FS#448 (cherry picked from commit c2b334bf41cbe6fa7b7e15d825dca1fa36c33770) --- modules/usrloc/ucontact.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/usrloc/ucontact.c b/modules/usrloc/ucontact.c index b18ce98..e295891 100644 --- a/modules/usrloc/ucontact.c +++ b/modules/usrloc/ucontact.c @@ -270,12 +270,14 @@ int mem_update_ucontact(ucontact_t* _c, ucontact_info_t* _ci) if(_ci->instance.s!=NULL && _ci->instance.len>0) { - /* when we have instance set, update contact address and call-id */ + /* when we have instance set, update contact address */ if(_ci->c!=NULL && _ci->c->s!=NULL && _ci->c->len>0) update_str( &_c->c, _ci->c); - if(_ci->callid!=NULL && _ci->callid->s!=NULL && _ci->callid->len>0) - update_str( &_c->callid, _ci->callid); } + + /* refresh call-id */ + if(_ci->callid!=NULL && _ci->callid->s!=NULL && _ci->callid->len>0) + update_str( &_c->callid, _ci->callid); update_str( &_c->user_agent, _ci->user_agent); if (_ci->received.s && _ci->received.len) {

9 years, 9 months

git:4.1: usrloc: generate callid at startup and increase cseq for records added via mi

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: 20a01c50c8a144c7edc838bea003b665469f4120 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=20a01c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 4 13:46:35 2014 +0200 usrloc: generate callid at startup and increase cseq for records added via mi - should fix FS#448, reported by Savolainen Dmitri (cherry picked from commit 66c497fdf4ac1c3b889a7c3b50c3e5fed770cf0b) --- modules/usrloc/ul_mi.c | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) diff --git a/modules/usrloc/ul_mi.c b/modules/usrloc/ul_mi.c index 3e12bf1..695fd38 100644 --- a/modules/usrloc/ul_mi.c +++ b/modules/usrloc/ul_mi.c @@ -48,9 +48,9 @@ #include "usrloc.h" /*! CSEQ nr used */ -#define MI_UL_CSEQ 1 +static int MI_UL_CSEQ = 0; /*! call-id used for ul_add and ul_rm_contact */ -static str mi_ul_cid = str_init("dfjrewr12386fd6-343(a)kamailio.mi"); +static str mi_ul_cid = {0,0}; /* str_init("dfjrewr12386fd6-343(a)kamailio.mi");*/ /*! user agent used for ul_add */ static str mi_ul_ua = str_init("SIP Router MI Server"); /*! path used for ul_add and ul_rm_contact */ @@ -58,8 +58,27 @@ static str mi_ul_path = str_init("dummypath"); extern sruid_t _ul_sruid; +static char mi_ul_cid_buf[32]; + /************************ helper functions ****************************/ +static void set_mi_ul_cid(void) +{ + int i; + char charset[] = "0123456789" + "abcdefghijklmnopqrstuvwxyz" + "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + + if(mi_ul_cid.s!=NULL) return; + + for(i=0; i<19; i++) { + mi_ul_cid_buf[i] = charset[rand()%(sizeof(charset) - 1)]; + } + memcpy(mi_ul_cid_buf+i, "@kamailio.mi", sizeof("@kamailio.mi")); + mi_ul_cid.s = mi_ul_cid_buf; + mi_ul_cid.len = strlen(mi_ul_cid.s); +} + /*! * \brief Search a domain in the global domain list * \param table domain (table) name @@ -360,6 +379,7 @@ struct mi_root* mi_usrloc_rm_contact(struct mi_root *cmd, void *param) } contact = &node->next->next->value; + set_mi_ul_cid(); ret = get_ucontact( rec, contact, &mi_ul_cid, &mi_ul_path, MI_UL_CSEQ+1, &con); if (ret < 0) { unlock_udomain( dom, aor); @@ -566,6 +586,7 @@ struct mi_root* mi_usrloc_add(struct mi_root *cmd, void *param) lock_udomain( dom, aor); + set_mi_ul_cid(); n = get_urecord( dom, aor, &r); if ( n==1) { if (insert_urecord( dom, aor, &r) < 0) @@ -580,7 +601,7 @@ struct mi_root* mi_usrloc_add(struct mi_root *cmd, void *param) ci.callid = &mi_ul_cid; ci.user_agent = &mi_ul_ua; - ci.cseq = MI_UL_CSEQ; + ci.cseq = ++MI_UL_CSEQ; /* 0 expires means permanent contact */ if (ci.expires!=0) ci.expires += act_time;

9 years, 9 months

git:4.1: tmx: handle branch_route for $T_reply_code

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: 9a0d01daf296cbe78b29e8db00f0d4b3e9c6cdca URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9a0d01d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jun 30 14:37:40 2014 +0200 tmx: handle branch_route for $T_reply_code - use latest sent reply code - related to the log message reported in FS#445 (cherry picked from commit 2e28163f2f3e756c89f8cc43df0644be38c5e06f) --- modules/tmx/t_var.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/tmx/t_var.c b/modules/tmx/t_var.c index 897f156..6b27ff5 100644 --- a/modules/tmx/t_var.c +++ b/modules/tmx/t_var.c @@ -472,6 +472,7 @@ int pv_get_tm_reply_code(struct sip_msg *msg, pv_param_t *param, } else { switch (get_route_type()) { case REQUEST_ROUTE: + case BRANCH_ROUTE: /* use the status of the last sent reply */ code = t->uas.status; break;

9 years, 9 months

git:4.1: kamctl: use DEFAULT_Q variable in ul_add command

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: 4b731cbb8426799377552c96f240a56ec528ef70 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4b731cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jun 30 12:34:24 2014 +0200 kamctl: use DEFAULT_Q variable in ul_add command (cherry picked from commit 8fac19ba52345a4dd10480ef4efb62012bbbbff6) --- utils/kamctl/kamctl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index b286d55..b44e552 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -2447,7 +2447,7 @@ usrloc() { fi $CTLCMD ul_add "$USRLOC_TABLE" "$OSERUSER@$OSERDOMAIN" "$2" \ -"$UL_EXPIRES" "1.00" "$UL_PATH" "$UL_FLAGS" "$BR_FLAGS" "$ALL_METHODS" +"$UL_EXPIRES" "$DEFAULT_Q" "$UL_PATH" "$UL_FLAGS" "$BR_FLAGS" "$ALL_METHODS" exit $? ;; rm)

9 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2014