sr-dev August 2012

sr-dev@lists.kamailio.org

30 participants
169 discussions

md5 license
by Victor Seva 02 Aug '12

02 Aug '12

Hi, It's seems that the license of md5.c [0] and md5.h [1] files are not compatible with GPL [2] so We have to use another implementation of md5[3][4] in order to get kamailio in Debian. I've attached the patch for master branch. Greetings, Victor. [0] http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob;f=md5.c [1] http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob;f=md5.h [2] http://lists.gnu.org/archive/html/bug-mailutils/2002-09/msg00016.html [3] http://anonscm.debian.org/viewvc/pkg-voip/kamailio/trunk/debian/patches/plu… [4] http://anonscm.debian.org/viewvc/pkg-voip/kamailio/trunk/debian/patches/plu…

2 1

planning release of v3.3.1
by Daniel-Constantin Mierla 02 Aug '12

02 Aug '12

Hello, I am planning to package v3.3.1 out of the latest branch 3.3 this Thursday, August 2. If you are aware of issues that are not listed on the tracker (http://sip-router.org/tracker/), add them there to see what can be sorted out before. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Training, Seattle, USA, Sep 23-26, 2012 - http://asipto.com/u/katu Kamailio Practical Workshop, Netherlands, Sep 10-12, 2012 - http://asipto.com/u/kpw

1 1

git:3.3: usrloc(k): on ul update, re-clone uri and callid if instance is set
by Daniel-Constantin Mierla 01 Aug '12

01 Aug '12

Module: sip-router Branch: 3.3 Commit: b5b534ec77634041d0ed11280241a947b61aff0c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b5b534e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 30 12:55:36 2012 +0200 usrloc(k): on ul update, re-clone uri and callid if instance is set - changes can happen when gruu/ob is enabled as the UA can get different address for same instance (cherry picked from commit a7cad776a514b0ec73a5c40b7971af8e0f0da92b) --- modules_k/usrloc/ucontact.c | 11 ++++++++--- modules_k/usrloc/usrloc.h | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/modules_k/usrloc/ucontact.c b/modules_k/usrloc/ucontact.c index 2d07a26..ac76e9b 100644 --- a/modules_k/usrloc/ucontact.c +++ b/modules_k/usrloc/ucontact.c @@ -218,9 +218,14 @@ int mem_update_ucontact(ucontact_t* _c, ucontact_info_t* _ci) char* ptr; - /* No need to update Callid as it is constant - * per ucontact (set at insert time) -bogdan */ - + if(_ci->instance.s!=NULL && _ci->instance.len>0) + { + /* when we have instance set, update contact address and call-id */ + 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); + } update_str( &_c->user_agent, _ci->user_agent); if (_ci->received.s && _ci->received.len) { diff --git a/modules_k/usrloc/usrloc.h b/modules_k/usrloc/usrloc.h index d08632b..bfd225a 100644 --- a/modules_k/usrloc/usrloc.h +++ b/modules_k/usrloc/usrloc.h @@ -94,6 +94,7 @@ typedef struct ucontact { /*! \brief Informations related to a contact */ typedef struct ucontact_info { str ruid; /*!< Pointer to record internal unique id */ + str *c; /*!< Contact address */ str received; /*!< Received interface */ str* path; /*!< Path informations */ time_t expires; /*!< Contact expires */

1 0

git:3.3: register(k): pack contact info based on header for searching existing ul records
by Daniel-Constantin Mierla 01 Aug '12

01 Aug '12

Module: sip-router Branch: 3.3 Commit: 153baccb8bbbcf08b6485f1cfc75a2b809bdafca URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=153bacc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 30 12:57:09 2012 +0200 register(k): pack contact info based on header for searching existing ul records - not using the contact header resulted in omitting instance and reg-id parameters, not following gruu/ob extensions, ending in duplicate records for same +sip.instance - reported by José Luis Millán (cherry picked from commit efa3099252ca5d200bef6ce71df33f33b55f9941) --- modules_k/registrar/save.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/modules_k/registrar/save.c b/modules_k/registrar/save.c index 8f18ea7..9b0607a 100644 --- a/modules_k/registrar/save.c +++ b/modules_k/registrar/save.c @@ -302,6 +302,10 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, } if(_c!=0) { + /* hook uri address - should be more than 'sip:' chars */ + if(_c->uri.s!=NULL && _c->uri.len>4) + ci.c = &_c->uri; + /* Calculate q value of the contact */ if (calc_contact_q(_c->q, &ci.q) < 0) { rerrno = R_INV_Q; @@ -651,6 +655,12 @@ static inline int update_contacts(struct sip_msg* _m, urecord_t* _r, /* calculate expires */ calc_contact_expires(_m, _c->expires, &expires); + /* pack the contact info */ + if ( (ci=pack_ci( 0, _c, expires, 0))==0 ) { + LM_ERR("failed to pack contact specific info\n"); + goto error; + } + /* search for the contact*/ ret = ul.get_ucontact_by_instance( _r, &_c->uri, ci, &c); if (ret==-1) { @@ -668,12 +678,6 @@ static inline int update_contacts(struct sip_msg* _m, urecord_t* _r, if (expires==0) continue; - /* pack the contact_info */ - if ( (ci=pack_ci( 0, _c, expires, 0))==0 ) { - LM_ERR("failed to extract contact info\n"); - goto error; - } - if (ul.insert_ucontact( _r, &_c->uri, ci, &c) < 0) { rerrno = R_UL_INS_C; LM_ERR("failed to insert contact\n"); @@ -710,12 +714,6 @@ static inline int update_contacts(struct sip_msg* _m, urecord_t* _r, rc = 3; } else { /* do update */ - /* pack the contact specific info */ - if ( (ci=pack_ci( 0, _c, expires, 0))==0 ) { - LM_ERR("failed to pack contact specific info\n"); - goto error; - } - if(_mode) { ptr=_r->contacts;

1 0

git:3.3: tls: set function to return the id
by Daniel-Constantin Mierla 01 Aug '12

01 Aug '12

Module: sip-router Branch: 3.3 Commit: 5f8405f577d66069fde48202862f06cac432139b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5f8405f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jul 18 19:00:38 2012 +0200 tls: set function to return the id - starting with v1.0.0 openssl does not use anymore getpid(), but address of errno which can point to same virtual address in a multi-process application - for refrence http://www.openssl.org/docs/crypto/threads.html - credits to Jijo on sr-dev mailing list (cherry picked from commit 0615826fe602c5183fbc7be7c51de5eb5eb7223c) --- modules/tls/tls_locking.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/modules/tls/tls_locking.c b/modules/tls/tls_locking.c index 86bda17..d85b14c 100644 --- a/modules/tls/tls_locking.c +++ b/modules/tls/tls_locking.c @@ -130,6 +130,10 @@ void tls_destroy_locks() } +unsigned long sr_ssl_id_f() +{ + return my_pid(); +} /* returns -1 on error, 0 on success */ int tls_init_locks() @@ -163,10 +167,13 @@ int tls_init_locks() CRYPTO_set_dynlock_lock_callback(dyn_lock_f); CRYPTO_set_dynlock_destroy_callback(dyn_destroy_f); - /* thread id callback: not needed because ser doesn't use thread and - * openssl already uses getpid() (by default) - * CRYPTO_set_id_callback(id_f); + /* starting with v1.0.0 openssl does not use anymore getpid(), but address + * of errno which can point to same virtual address in a multi-process + * application + * - for refrence http://www.openssl.org/docs/crypto/threads.html */ + CRYPTO_set_id_callback(sr_ssl_id_f); + /* atomic add -- since for now we don't have atomic_add * (only atomic_inc), fallback to the default use-locks mode * CRYPTO_set_add_lock_callback(atomic_add_f);

1 0

git:3.3: dispatcher(k): allow set id 0 for OPTIONS callback
by Daniel-Constantin Mierla 01 Aug '12

01 Aug '12

Module: sip-router Branch: 3.3 Commit: 81149e30785aa1cc6f04e130afafb643d9163cce URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=81149e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jun 25 10:36:31 2012 +0200 dispatcher(k): allow set id 0 for OPTIONS callback - set id is provided in param pointer address, 0 being equivalent to NULL - reported by Avi Brender (cherry picked from commit 2664cb9aa8ffd5d26ef6a0841318ccbcdefbf69b) --- modules_k/dispatcher/dispatch.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index a60401c..7429e97 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -2326,9 +2326,9 @@ static void ds_options_callback( struct cell *t, int type, sip_msg_t *fmsg; int state; - /* The Param does contain the group, in which the failed host + /* The param contains the group, in which the failed host * can be found.*/ - if (!*ps->param) + if (ps->param==NULL) { LM_DBG("No parameter provided, OPTIONS-Request was finished" " with code %d\n", ps->code);

1 0

git:3.3: kamdbctl: mtree tables were not in the list for db creation
by Daniel-Constantin Mierla 01 Aug '12

01 Aug '12

Module: sip-router Branch: 3.3 Commit: cd50811c1964e4e2227e45ffcb4e5e1f0db04745 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd50811… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jul 18 18:51:54 2012 +0200 kamdbctl: mtree tables were not in the list for db creation (cherry picked from commit e35e16efbbc6c746a7a4dfeddfc241c2c78d30bc) --- utils/kamctl/kamdbctl.base | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base index c8a78fa..59bc2e7 100644 --- a/utils/kamctl/kamdbctl.base +++ b/utils/kamctl/kamdbctl.base @@ -38,7 +38,7 @@ STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases domain domain_attrs grp aliases silo dialog dialog_vars dispatcher dialplan} EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy carrierroute carrier_name domain_name carrierfailureroute userblacklist - globalblacklist htable purplemap uacreg pl_pipes} + globalblacklist htable purplemap uacreg pl_pipes mtree mtrees} PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap pua rls_presentity rls_watchers} @@ -67,7 +67,7 @@ STANDARD_MODULES=${STANDARD_MODULES:-standard acc lcr domain group permissions speeddial avpops auth_db pdt dialog dispatcher dialplan} EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute - userblacklist htable purple uac pipelimit} + userblacklist htable purple uac pipelimit mtree} ############################################################

1 0

git:3.3: p_usrloc: added missing usrloc API members
by Daniel-Constantin Mierla 01 Aug '12

01 Aug '12

Module: sip-router Branch: 3.3 Commit: fe8265334cef872d8f3fabe407d3f3d744a45960 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fe82653… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jun 28 16:24:47 2012 +0200 p_usrloc: added missing usrloc API members - they are set to NULL to get a clean crash, they have to be implemented - the missing API members are the functions introduced in 3.3 for handling SIP GRUU and Outbound extensions - a proper fix to follow - reported by Dan Bogos (cherry picked from commit f030b2f274b69526f256e66098de72a074000ed1) --- modules_k/p_usrloc/usrloc.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/modules_k/p_usrloc/usrloc.c b/modules_k/p_usrloc/usrloc.c index 3a1b4fc..b268052 100644 --- a/modules_k/p_usrloc/usrloc.c +++ b/modules_k/p_usrloc/usrloc.c @@ -65,6 +65,8 @@ int bind_usrloc(usrloc_api_t* api) return -1; } + memset(api, 0, sizeof(usrloc_api_t)); + api->register_udomain = register_udomain; api->get_all_ucontacts = get_all_ucontacts; api->insert_urecord = insert_urecord; @@ -79,6 +81,11 @@ int bind_usrloc(usrloc_api_t* api) api->update_ucontact = update_ucontact; api->register_ulcb = register_ulcb; + api->get_udomain = 0; + api->get_urecord_by_ruid = 0; + api->get_ucontact_by_instance = 0; + api->get_aorhash = 0; + api->use_domain = use_domain; api->db_mode = db_mode; api->nat_flag = nat_bflag;

1 0

git:3.3: kamailio.cfg: removed sample db_mode parameter for domain module
by Daniel-Constantin Mierla 01 Aug '12

01 Aug '12

Module: sip-router Branch: 3.3 Commit: 87618b2f1c5d6e3724c3935709b81b151c4645b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=87618b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jul 18 08:27:52 2012 +0200 kamailio.cfg: removed sample db_mode parameter for domain module - no longer exists since 3.3 domain update (cherry picked from commit bb4925540d241eb91cc8b68712bec20f1970b086) --- etc/kamailio.cfg | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 158b525..f8b375c 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -380,8 +380,6 @@ modparam("speeddial", "use_domain", MULTIDOMAIN) # ----- domain params ----- #!ifdef WITH_MULTIDOMAIN modparam("domain", "db_url", DBURL) -# use caching -modparam("domain", "db_mode", 1) # register callback to match myself condition with domains list modparam("domain", "register_myself", 1) #!endif

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