sr-dev November 2014

sr-dev@lists.kamailio.org

38 participants
207 discussions

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router
by Jason Penton 11 Nov '14

11 Nov '14

Module: sip-router Branch: master Commit: daf2b6ef1355cf6344f0b062ea7203bb652601bc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=daf2b6e… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Tue Nov 11 15:16:29 2014 +0200 Merge branch 'master' of ssh://git.sip-router.org/sip-router ---

1 0

git:4.2: Makefile.defs: version set to 4.2.1
by Daniel-Constantin Mierla 11 Nov '14

11 Nov '14

Module: sip-router Branch: 4.2 Commit: 23a70da2e560ff9cae84271930321dc3075a2ad3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=23a70da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 11 13:38:23 2014 +0100 Makefile.defs: version set to 4.2.1 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index bc3170e..32b400a 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -164,7 +164,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 4 PATCHLEVEL = 2 -SUBLEVEL = 0 +SUBLEVEL = 1 EXTRAVERSION = # memory manager switcher

1 0

git:4.2: pkg/deb: version set to 4.2.1 in spec files
by Daniel-Constantin Mierla 11 Nov '14

11 Nov '14

Module: sip-router Branch: 4.2 Commit: 79aea2314f3f4ef93645726c53ae3b9e9a66037b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=79aea23… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 11 12:56:52 2014 +0100 pkg/deb: version set to 4.2.1 in spec files --- pkg/kamailio/deb/debian/changelog | 6 ++++++ pkg/kamailio/deb/jessie/changelog | 6 ++++++ pkg/kamailio/deb/precise/changelog | 6 ++++++ pkg/kamailio/deb/squeeze/changelog | 6 ++++++ pkg/kamailio/deb/trusty/changelog | 6 ++++++ pkg/kamailio/deb/wheezy/changelog | 6 ++++++ 6 files changed, 36 insertions(+), 0 deletions(-) diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index ce6fcfb..dcf2829 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.1) unstable; urgency=medium + + * update versionto 4.2.1 + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Tue, 11 Nov 2014 11:55:40 +0100 + kamailio (4.2.0) unstable; urgency=medium * update versionto 4.2.0 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index ce6fcfb..dcf2829 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.1) unstable; urgency=medium + + * update versionto 4.2.1 + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Tue, 11 Nov 2014 11:55:40 +0100 + kamailio (4.2.0) unstable; urgency=medium * update versionto 4.2.0 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index ce6fcfb..dcf2829 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.1) unstable; urgency=medium + + * update versionto 4.2.1 + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Tue, 11 Nov 2014 11:55:40 +0100 + kamailio (4.2.0) unstable; urgency=medium * update versionto 4.2.0 diff --git a/pkg/kamailio/deb/squeeze/changelog b/pkg/kamailio/deb/squeeze/changelog index ce6fcfb..dcf2829 100644 --- a/pkg/kamailio/deb/squeeze/changelog +++ b/pkg/kamailio/deb/squeeze/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.1) unstable; urgency=medium + + * update versionto 4.2.1 + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Tue, 11 Nov 2014 11:55:40 +0100 + kamailio (4.2.0) unstable; urgency=medium * update versionto 4.2.0 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index ce6fcfb..dcf2829 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.1) unstable; urgency=medium + + * update versionto 4.2.1 + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Tue, 11 Nov 2014 11:55:40 +0100 + kamailio (4.2.0) unstable; urgency=medium * update versionto 4.2.0 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index ce6fcfb..dcf2829 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.1) unstable; urgency=medium + + * update versionto 4.2.1 + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Tue, 11 Nov 2014 11:55:40 +0100 + kamailio (4.2.0) unstable; urgency=medium * update versionto 4.2.0

1 0

git:4.2: ChangeLog: content updated for v4.2.1
by Daniel-Constantin Mierla 11 Nov '14

11 Nov '14

Module: sip-router Branch: 4.2 Commit: 868a34ef4ff23929d9698db8ca468c721fc0e0b0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=868a34e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 11 13:43:51 2014 +0100 ChangeLog: content updated for v4.2.1 --- ChangeLog | 653 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 653 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=868…

1 0

git:4.2: pkg/rpm: set version 4.2.1 in spec files
by Daniel-Constantin Mierla 11 Nov '14

11 Nov '14

Module: sip-router Branch: 4.2 Commit: 3bd165bc6efa87920cc0bbdf5084755ebc62d66e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3bd165b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 11 12:46:54 2014 +0100 pkg/rpm: set version 4.2.1 in spec files --- pkg/kamailio/centos/6/kamailio.spec | 2 +- pkg/kamailio/fedora/17/kamailio.spec | 2 +- pkg/kamailio/rpm/kamailio.spec-4.1 | 2 +- pkg/kamailio/rpm/kamailio.spec.CenOS | 2 +- pkg/kamailio/rpm/kamailio.spec.SuSE | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/kamailio/centos/6/kamailio.spec b/pkg/kamailio/centos/6/kamailio.spec index 5653b19..3fde15f 100644 --- a/pkg/kamailio/centos/6/kamailio.spec +++ b/pkg/kamailio/centos/6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.2.0 +%define ver 4.2.1 %define rel 0%{dist} diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec index e987167..b4f9afd 100644 --- a/pkg/kamailio/fedora/17/kamailio.spec +++ b/pkg/kamailio/fedora/17/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.2.0 +%define ver 4.2.1 %define rel 0%{dist} diff --git a/pkg/kamailio/rpm/kamailio.spec-4.1 b/pkg/kamailio/rpm/kamailio.spec-4.1 index aeebfcf..3dbd4b7 100644 --- a/pkg/kamailio/rpm/kamailio.spec-4.1 +++ b/pkg/kamailio/rpm/kamailio.spec-4.1 @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.2.0 +%define ver 4.2.1 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c avp_radius auth_radius group_radius uri_radius pa postgres osp tlsops unixodbc diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index 8551545..8f0d337 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.2.0 +%define ver 4.2.1 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec.SuSE b/pkg/kamailio/rpm/kamailio.spec.SuSE index 77af948..c4559c2 100644 --- a/pkg/kamailio/rpm/kamailio.spec.SuSE +++ b/pkg/kamailio/rpm/kamailio.spec.SuSE @@ -1,5 +1,5 @@ %define name kamailio -%define ver 1.2.0 +%define ver 4.2.1 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c auth_radius misc_radius peering postgress pa unixodbc osp tlsops

1 0

git:4.2: tm: handle BRANCH_FAILURE_ROUTE in t_check_trans() test
by Daniel-Constantin Mierla 11 Nov '14

11 Nov '14

Module: sip-router Branch: 4.2 Commit: 00c884a644689ec9e135283c26d0d9f90711bb4c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=00c884a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Nov 10 15:42:39 2014 +0100 tm: handle BRANCH_FAILURE_ROUTE in t_check_trans() test (cherry picked from commit 08248bae17024246442046376a4350007a100025) --- modules/tm/tm.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/tm/tm.c b/modules/tm/tm.c index b818256..80476e0 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -2115,9 +2115,10 @@ int t_check_trans(struct sip_msg* msg) int ret; /* already processing a T */ - if(get_route_type()==FAILURE_ROUTE - || get_route_type()==BRANCH_ROUTE - || get_route_type()==TM_ONREPLY_ROUTE) { + if(is_route_type(FAILURE_ROUTE) + || is_route_type(BRANCH_ROUTE) + || is_route_type(BRANCH_FAILURE_ROUTE) + || is_route_type(TM_ONREPLY_ROUTE)) { return 1; }

1 0

git:4.2: htable: elaborated docs about sht_lock() and sht_unlock()
by Daniel-Constantin Mierla 11 Nov '14

11 Nov '14

Module: sip-router Branch: 4.2 Commit: 69db8e643ac2356e443eddd9eecb14430f3e7452 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=69db8e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Nov 8 11:10:11 2014 +0100 htable: elaborated docs about sht_lock() and sht_unlock() (cherry picked from commit 44269cd654a6ab0557ca242f25ec41158e7dcbaf) --- modules/htable/README | 8 ++++++-- modules/htable/doc/htable_admin.xml | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/modules/htable/README b/modules/htable/README index 5a27593..322fac9 100644 --- a/modules/htable/README +++ b/modules/htable/README @@ -672,7 +672,9 @@ sht_reset("ha$var(x)"); 4.5. sht_lock(htable=>key) - Lock the slot in htable corespoding to the key item. + Lock the slot in htable corespoding to the key item. Note that the + locking is re-entrant for the process, therefore the lock and unlock + should be done by the same process. This function can be used from ANY_ROUTE. @@ -683,7 +685,9 @@ sht_lock("ha=>test"); 4.6. sht_unlock(htable=>key) - Unlock the slot in htable corespoding to the key item. + Unlock the slot in htable corespoding to the key item. Note that the + locking is re-entrant for the process, therefore the lock and unlock + should be done by the same process. This function can be used from ANY_ROUTE. diff --git a/modules/htable/doc/htable_admin.xml b/modules/htable/doc/htable_admin.xml index bfba088..5281f74 100644 --- a/modules/htable/doc/htable_admin.xml +++ b/modules/htable/doc/htable_admin.xml @@ -735,7 +735,9 @@ sht_reset("ha$var(x)"); <function moreinfo="none">sht_lock(htable=>key)</function> </title> <para> - Lock the slot in htable corespoding to the key item. + Lock the slot in htable corespoding to the key item. Note that + the locking is re-entrant for the process, therefore the lock + and unlock should be done by the same process. </para> <para> This function can be used from ANY_ROUTE. @@ -754,7 +756,9 @@ sht_lock("ha=>test"); <function moreinfo="none">sht_unlock(htable=>key)</function> </title> <para> - Unlock the slot in htable corespoding to the key item. + Unlock the slot in htable corespoding to the key item. Note that + the locking is re-entrant for the process, therefore the lock + and unlock should be done by the same process. </para> <para> This function can be used from ANY_ROUTE.

1 0

git:4.2: pua_reginfo: avoid sending notify when processing location record action triggered by itself
by Daniel-Constantin Mierla 11 Nov '14

11 Nov '14

Module: sip-router Branch: 4.2 Commit: 39d6a77084f6c32af1f0de646410a247e55355c3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=39d6a77… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 4 16:32:13 2014 +0100 pua_reginfo: avoid sending notify when processing location record action triggered by itself (cherry picked from commit e070257321853d799a6325ac5e94f69b4ccb85e7) --- modules/pua_reginfo/notify.c | 21 +++++++++++++++------ modules/pua_reginfo/usrloc_cb.c | 12 ++++++++++++ modules/pua_reginfo/usrloc_cb.h | 6 ++++++ 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/modules/pua_reginfo/notify.c b/modules/pua_reginfo/notify.c index 6cc1e67..b209577 100644 --- a/modules/pua_reginfo/notify.c +++ b/modules/pua_reginfo/notify.c @@ -28,6 +28,7 @@ #include "../../modules/usrloc/usrloc.h" #include "../../lib/srutils/sruid.h" #include <libxml/parser.h> +#include "usrloc_cb.h" #include "pua_reginfo.h" /*<?xml version="1.0"?> @@ -71,7 +72,9 @@ int process_contact(udomain_t * domain, urecord_t ** ul_record, str aor, str cal static str no_ua = str_init("n/a"); static ucontact_info_t ci; ucontact_t * ul_contact; + int ret; + pua_reginfo_update_self_op(1); if (*ul_record == NULL) { switch(event) { case EVENT_REGISTERED: @@ -81,14 +84,15 @@ int process_contact(udomain_t * domain, urecord_t ** ul_record, str aor, str cal create a new entry for this user in the usrloc-DB */ if (ul.insert_urecord(domain, &aor, ul_record) < 0) { LM_ERR("failed to insert new user-record\n"); - return RESULT_ERROR; + ret = RESULT_ERROR; + goto done; } break; default: /* No entry in usrloc and the contact is expired, deleted, unregistered, whatever: We do not need to do anything. */ - return RESULT_NO_CONTACTS; - break; + ret = RESULT_NO_CONTACTS; + goto done; } } @@ -118,12 +122,14 @@ int process_contact(udomain_t * domain, urecord_t ** ul_record, str aor, str cal || (ul.get_ucontact(*ul_record, &contact_uri, &callid, &no_str, cseq+1, &ul_contact) != 0)) { if (ul.insert_ucontact(*ul_record, &contact_uri, &ci, &ul_contact) < 0) { LM_ERR("failed to insert new contact\n"); - return RESULT_ERROR; + ret = RESULT_ERROR; + goto done; } } else { if (ul.update_ucontact(*ul_record, ul_contact, &ci) < 0) { LM_ERR("failed to update contact\n"); - return RESULT_ERROR; + ret = RESULT_ERROR; + goto done; } } ul_contact = (*ul_record)->contacts; @@ -132,7 +138,10 @@ int process_contact(udomain_t * domain, urecord_t ** ul_record, str aor, str cal ul_contact = ul_contact->next; } - return RESULT_NO_CONTACTS; + ret = RESULT_NO_CONTACTS; +done: + pua_reginfo_update_self_op(0); + return ret; } xmlNodePtr xmlGetNodeByName(xmlNodePtr parent, const char *name) { diff --git a/modules/pua_reginfo/usrloc_cb.c b/modules/pua_reginfo/usrloc_cb.c index 2360a70..0164a67 100644 --- a/modules/pua_reginfo/usrloc_cb.c +++ b/modules/pua_reginfo/usrloc_cb.c @@ -49,6 +49,12 @@ Call-ID: 9ad9f89f-164d-bb86-1072-52e7e9eb5025. .</registration> </reginfo> */ +static int _pua_reginfo_self_op = 0; + +void pua_reginfo_update_self_op(int v) +{ + _pua_reginfo_self_op = v; +} str* build_reginfo_full(urecord_t * record, str uri, ucontact_t* c, int type) { xmlDocPtr doc = NULL; @@ -221,6 +227,12 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { char id_buf[512]; int id_buf_len; + if(_pua_reginfo_self_op == 1) { + LM_DBG("operation triggered by own action for aor: %.*s (%d)\n", + c->aor->len, c->aor->s, type); + return; + } + content_type.s = "application/reginfo+xml"; content_type.len = 23; diff --git a/modules/pua_reginfo/usrloc_cb.h b/modules/pua_reginfo/usrloc_cb.h index 0bdd1ca..f0e565e 100644 --- a/modules/pua_reginfo/usrloc_cb.h +++ b/modules/pua_reginfo/usrloc_cb.h @@ -21,6 +21,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef __PUA_REGINFO_USRLOC_CB__ +#define __PUA_REGINFO_USRLOC_CB__ + #include "../usrloc/usrloc.h" void reginfo_usrloc_cb(ucontact_t* c, int type, void* param); +void pua_reginfo_update_self_op(int v); + +#endif

1 0

git:4.2: htable: make locking to access a slot re-entrant for a process
by Daniel-Constantin Mierla 11 Nov '14

11 Nov '14

Module: sip-router Branch: 4.2 Commit: 7e6a27a907806fc48c35895c471c7d1ab97f2d27 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7e6a27a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Nov 8 10:57:00 2014 +0100 htable: make locking to access a slot re-entrant for a process - proper functionality for sht_lock()/sht_unlock() (cherry picked from commit 4f07daab9cb95e13c7c89a9a566d4a8c88b9145e) --- modules/htable/ht_api.c | 119 +++++++++++++++++++++++++++++----------------- modules/htable/ht_api.h | 11 +++- modules/htable/ht_db.c | 3 +- modules/htable/htable.c | 38 ++++++++-------- 4 files changed, 104 insertions(+), 67 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=7e6…

1 0

git:4.2: htable: use mode everywhere to control the locks for add operation
by Daniel-Constantin Mierla 11 Nov '14

11 Nov '14

Module: sip-router Branch: 4.2 Commit: 4bd289f1d893fd36c4fe508f34c0d2a58901d119 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4bd289f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 6 18:43:50 2014 +0100 htable: use mode everywhere to control the locks for add operation (cherry picked from commit c7ff8a88e773e8d25958f86d178f05ee10fd0410) --- modules/htable/ht_api.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/htable/ht_api.c b/modules/htable/ht_api.c index 13d373d..55f1f3a 100644 --- a/modules/htable/ht_api.c +++ b/modules/htable/ht_api.c @@ -606,7 +606,7 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, if(it->next) it->next->prev = it->prev; ht->entries[idx].esize--; - lock_release(&ht->entries[idx].lock); + if(mode) lock_release(&ht->entries[idx].lock); ht_cell_free(it); return NULL; } @@ -625,7 +625,7 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, if(old->msize>=it->msize) { memcpy(old, it, it->msize); - lock_release(&ht->entries[idx].lock); + if(mode) lock_release(&ht->entries[idx].lock); return old; } } @@ -673,7 +673,7 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, if(old->msize>=it->msize) { memcpy(old, it, it->msize); - lock_release(&ht->entries[idx].lock); + if(mode) lock_release(&ht->entries[idx].lock); return old; } }

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
21
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2014