sr-dev January 2014

sr-dev@lists.kamailio.org

27 participants
210 discussions

git:4.1: pkg/deb: versio set to 4.1.1 in deb specs

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: 497d0c5ad34250106782bc9a424e872d341305b7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=497d0c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 9 15:58:08 2014 +0100 pkg/deb: versio set to 4.1.1 in deb specs --- pkg/kamailio/deb/debian/changelog | 6 ++++++ pkg/kamailio/deb/jessie/changelog | 6 ++++++ pkg/kamailio/deb/lucid/changelog | 6 ++++++ pkg/kamailio/deb/precise/changelog | 6 ++++++ pkg/kamailio/deb/squeeze/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 f5d3633..fcf832b 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (4.1.1) unstable; urgency=low + + * update to 4.1.1 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 09 Jan 2014 15:45:35 +0100 + kamailio (4.1.0) unstable; urgency=low * update to 4.1.0 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index f5d3633..fcf832b 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (4.1.1) unstable; urgency=low + + * update to 4.1.1 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 09 Jan 2014 15:45:35 +0100 + kamailio (4.1.0) unstable; urgency=low * update to 4.1.0 diff --git a/pkg/kamailio/deb/lucid/changelog b/pkg/kamailio/deb/lucid/changelog index f5d3633..fcf832b 100644 --- a/pkg/kamailio/deb/lucid/changelog +++ b/pkg/kamailio/deb/lucid/changelog @@ -1,3 +1,9 @@ +kamailio (4.1.1) unstable; urgency=low + + * update to 4.1.1 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 09 Jan 2014 15:45:35 +0100 + kamailio (4.1.0) unstable; urgency=low * update to 4.1.0 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index 74a19e1..753f2af 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (4.1.1) unstable; urgency=low + + * update to 4.1.1 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 09 Jan 2014 15:45:35 +0100 + kamailio (4.1.0) unstable; urgency=low * update to 4.1.0 diff --git a/pkg/kamailio/deb/squeeze/changelog b/pkg/kamailio/deb/squeeze/changelog index f5d3633..fcf832b 100644 --- a/pkg/kamailio/deb/squeeze/changelog +++ b/pkg/kamailio/deb/squeeze/changelog @@ -1,3 +1,9 @@ +kamailio (4.1.1) unstable; urgency=low + + * update to 4.1.1 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 09 Jan 2014 15:45:35 +0100 + kamailio (4.1.0) unstable; urgency=low * update to 4.1.0 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index f5d3633..fcf832b 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (4.1.1) unstable; urgency=low + + * update to 4.1.1 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 09 Jan 2014 15:45:35 +0100 + kamailio (4.1.0) unstable; urgency=low * update to 4.1.0

10 years, 4 months

git:4.1: pkg/rpm: versio set to 4.1.1 in rpm specs

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: 1e5f78ae7934112e502a1573aa2490ea647b08d0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1e5f78a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 9 15:54:31 2014 +0100 pkg/rpm: versio set to 4.1.1 in rpm specs --- pkg/kamailio/rpm/kamailio.spec-4.1 | 2 +- pkg/kamailio/rpm/kamailio.spec.CenOS | 2 +- pkg/kamailio/rpm/kamailio.spec.SuSE | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/kamailio/rpm/kamailio.spec-4.1 b/pkg/kamailio/rpm/kamailio.spec-4.1 index 12b02f0..6578398 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 1.2.0 +%define ver 4.1.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 6b396c7..29417db 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 3.2.0 +%define ver 4.1.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..eead83e 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.1.1 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c auth_radius misc_radius peering postgress pa unixodbc osp tlsops

10 years, 4 months

git:4.1: Makefile.defs: version set to 4.1.1

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: b9e86b9fd8f7102838b0012f6ebfecd55ef607be URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b9e86b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 9 15:59:01 2014 +0100 Makefile.defs: version set to 4.1.1 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 327eeb9..9b2259a 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -164,7 +164,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 4 PATCHLEVEL = 1 -SUBLEVEL = 0 +SUBLEVEL = 1 EXTRAVERSION = # memory manager switcher

10 years, 4 months

Releasing v4.1.1

by Daniel-Constantin Mierla

Hello, I am considering to release v4.1.1 out of branch 4.1 this week on Thursday -- there were couple of fixes since we did v4.1.0. If there are any open issues that should get addresses, reply here. Also, for developers, if there are patches only on master branch that should be pushed on 4.1 as well, do it as soon as possible. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

10 years, 4 months

git:master: pkg/deb: Add 4.2.0~dev1 version

by Victor Seva

Module: sip-router Branch: master Commit: 619cbfa607882512c8bd458a39cb497d6d6593cb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=619cbfa… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Wed Jan 8 19:17:04 2014 +0100 pkg/deb: Add 4.2.0~dev1 version --- pkg/kamailio/deb/debian/changelog | 6 ++++++ pkg/kamailio/deb/jessie/changelog | 6 ++++++ pkg/kamailio/deb/precise/changelog | 12 ++++++------ pkg/kamailio/deb/squeeze/changelog | 6 ++++++ pkg/kamailio/deb/wheezy/changelog | 6 ++++++ 5 files changed, 30 insertions(+), 6 deletions(-) diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 22c35bd..197cacc 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.0~dev1) unstable; urgency=medium + + * update version to 4.2.0~dev1 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Wed, 08 Jan 2014 19:13:30 +0100 + kamailio (4.2.0~dev0) unstable; urgency=low * Added packages: diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index 22c35bd..197cacc 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.0~dev1) unstable; urgency=medium + + * update version to 4.2.0~dev1 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Wed, 08 Jan 2014 19:13:30 +0100 + kamailio (4.2.0~dev0) unstable; urgency=low * Added packages: diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index edd66e1..7a8d816 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.0~dev1) unstable; urgency=medium + + * update version to 4.2.0~dev1 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Wed, 08 Jan 2014 19:13:30 +0100 + kamailio (4.2.0~dev0) unstable; urgency=low * Added packages: @@ -18,12 +24,6 @@ kamailio (3.4.0~dev0) unstable; urgency=low -- Jon Bonilla <manwe(a)aholab.ehu.es> Wed, 15 Jun 2012 03:15:00 +0100 -kamailio (3.3-dev) unstable; urgency=low - - * Set version to 3.3-dev for dev builds - - -- Jon Bonilla <manwe(a)aholab.ehu.es> Wed, 19 Oct 2011 17:24:00 +0100 - kamailio (3.2.0) unstable; urgency=low * update to 3.2.0 from upstream diff --git a/pkg/kamailio/deb/squeeze/changelog b/pkg/kamailio/deb/squeeze/changelog index 22c35bd..197cacc 100644 --- a/pkg/kamailio/deb/squeeze/changelog +++ b/pkg/kamailio/deb/squeeze/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.0~dev1) unstable; urgency=medium + + * update version to 4.2.0~dev1 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Wed, 08 Jan 2014 19:13:30 +0100 + kamailio (4.2.0~dev0) unstable; urgency=low * Added packages: diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 22c35bd..197cacc 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.0~dev1) unstable; urgency=medium + + * update version to 4.2.0~dev1 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Wed, 08 Jan 2014 19:13:30 +0100 + kamailio (4.2.0~dev0) unstable; urgency=low * Added packages:

10 years, 4 months

New commits on branch 4.1

by Daniel-Constantin Mierla

URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=32aacba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 8 19:06:19 2014 +0100 htable, permissions, print: regenerated readme files URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=af04ad8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 7 10:23:11 2014 +0100 permissions: fixed previous commit which used invalid variable - reported by Kelvin Chua (cherry picked from commit 34d9088d74cb8269960cc20912a675a67598e7d7) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=11ff3de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 7 00:58:20 2014 +0100 presence_dialoginfo: handle all states to get most relevant xml - patch from FS#341 (cherry picked from commit f845465eb96770e0c02c92ae862cdc94f561e29e) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9af6dbd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 7 00:10:34 2014 +0100 tls: the pointer of cfg structure - synchronize when updating the list of tls configs and their reference count - with parts from patch by Ding Ma, FS#380, contributed under BSD license (cherry picked from commit 208934d47ac1585d42029234267bcceab40ae218) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b55c87a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 6 19:51:41 2014 +0100 permissions: note about peer tag mode that applies only for allow_trusted() (cherry picked from commit 15f8a92baf58ee70e837b3b7e7f208b1a2678a0a) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4ec0be8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 6 19:48:54 2014 +0100 permissions: set peer tag avp for allow_address_group() - also for allow_source_address_group() - reported by Kelvin Chua (cherry picked from commit 0c67042fa629ee4744cfc31a15e571b7340b0881) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=93f4936… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Tue Dec 31 23:24:02 2013 +0100 modules/sipcapture: Fixed bad timestamp in the raw socket mode HEPpy New Year! (cherry picked from commit cc34c8e2c1e0eeafa0088c2d159260e4b10652c9) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7552d77… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 27 23:31:41 2013 +0100 htable: added section id for functions and parameters (cherry picked from commit 0e0b8cd883718bb5d19999e800159add7714f69e) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c00a33a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 19 21:15:12 2013 +0100 acc: use r-uri winning branch even for local generated replies - it was only for received and relayed replies - reported by Kelvin Chua (cherry picked from commit 81b9c83b2fa3bd32d502a1ae9014cc7d6747e710) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d1c3ebe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 6 19:03:08 2013 +0100 tls: removed unsigned int comparison with <0 (cherry picked from commit 7d6dc390bac2b49615444bcbad74cd39f3c82302) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=04778b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 6 18:54:52 2013 +0100 sipcapture: fixed clang compile warnings - extra parameters for sprintf() match format specifiers (cherry picked from commit b131f4402cf604bbe90123aa95a6cbc8412c2de0) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=90f8cee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 6 18:34:49 2013 +0100 ratelimit: signed check for pipe number in rpc_set_queue() - rpc can reand signed value (cherry picked from commit ed034d4d9096d8c77269828c8efdafb26eac5372) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b1bffbe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 6 18:30:49 2013 +0100 pike: memset of address print buffer with proper size (cherry picked from commit d54eb083f59fb55ccbc79e49b5b3e05426bd3795) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7e35f56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 6 18:25:30 2013 +0100 permissions: signess warning fix (cherry picked from commit 26e04f2053c9f33333bbbf79af6897428a1d9a88) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5481307… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 6 18:23:17 2013 +0100 maxforwards: use standard format instead of GNU old-style field designator (cherry picked from commit cd04947b0ccb1c861274483f458bfc7f4329accb) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d7d84da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 6 18:20:16 2013 +0100 ctl: removed not needed extra paranthesis (cherry picked from commit efda774f6391f1e909a9967898c64fb25f53eeba) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bb9df83… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 6 18:18:48 2013 +0100 acc: strftime() returns 0 on error (cherry picked from commit 89262590e4d47e480fb4984f18e12b4e4edb4ca6) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7323998… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 6 18:15:22 2013 +0100 pv: use int index for looking up flag index - some functions used for check may return negative on error (cherry picked from commit 30359b3cfce2ce909153e06b1954778c4eababa7) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eab7927… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 6 11:41:38 2013 +0100 snmpstats: use install-cfg target to deploy MIBs - existing target was no longer valid from v3.0 (cherry picked from commit a8d0d9e9224c2e7399c95c533dff67a6303891d2)

10 years, 4 months

git:master: Makefile.defs: version set to 4.2.0-dev1

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 3da6084797b9f78a555a3108c5bb08e176a10da6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3da6084… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 8 18:24:04 2014 +0100 Makefile.defs: version set to 4.2.0-dev1 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 0db57fe..589fc26 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -165,7 +165,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 4 PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -dev0 +EXTRAVERSION = -dev1 # memory manager switcher # 0 - f_malloc (fast malloc)

10 years, 4 months

git:master: dialog: added prefix to global variable to reduce the risk of symbol conflict

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b5993240da29f1c13a2900ecf479f95973afd599 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b599324… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 8 18:23:04 2014 +0100 dialog: added prefix to global variable to reduce the risk of symbol conflict --- modules/dialog/dialog.c | 9 +++++---- modules/dialog/dlg_handlers.c | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/dialog/dialog.c b/modules/dialog/dialog.c index 4072981..307b90f 100644 --- a/modules/dialog/dialog.c +++ b/modules/dialog/dialog.c @@ -123,7 +123,7 @@ int active_dlgs_cnt = 0; int early_dlgs_cnt = 0; int detect_spirals = 1; int dlg_send_bye = 0; -int timeout_noreset = 0; +int dlg_timeout_noreset = 0; stat_var *active_dlgs = 0; stat_var *processed_dlgs = 0; stat_var *expired_dlgs = 0; @@ -282,7 +282,7 @@ static param_export_t mod_params[]={ { "xavp_cfg", STR_PARAM, &dlg_xavp_cfg.s }, { "ka_timer", INT_PARAM, &dlg_ka_timer }, { "ka_interval", INT_PARAM, &dlg_ka_interval }, - { "timeout_noreset", INT_PARAM, &timeout_noreset }, + { "timeout_noreset", INT_PARAM, &dlg_timeout_noreset }, { 0,0,0 } }; @@ -579,8 +579,9 @@ static int mod_init(void) return -1; } - if (timeout_noreset != 0 && timeout_noreset != 1) { - LM_ERR("invalid value %d for timeout_noreset param!!\n",timeout_noreset); + if (dlg_timeout_noreset != 0 && dlg_timeout_noreset != 1) { + LM_ERR("invalid value %d for timeout_noreset param!!\n", + dlg_timeout_noreset); return -1; } diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index 590e894..44bbc12 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -82,7 +82,7 @@ static int default_timeout; /*!< default dialog timeout */ static int seq_match_mode; /*!< dlg_match mode */ static int shutdown_done = 0; /*!< 1 when destroy_dlg_handlers was called */ extern int detect_spirals; -extern int timeout_noreset; +extern int dlg_timeout_noreset; extern int initial_cbs_inscript; extern int dlg_send_bye; extern int dlg_event_rt[DLG_EVENTRT_MAX]; @@ -1259,7 +1259,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) if (timeout!=default_timeout) { dlg->lifetime = timeout; } - reset = !((dlg->iflags & DLG_IFLAG_TIMER_NORESET) || timeout_noreset); + reset = !((dlg->iflags & DLG_IFLAG_TIMER_NORESET) || dlg_timeout_noreset); if ((new_state!=DLG_STATE_EARLY) && (old_state!=DLG_STATE_CONFIRMED || reset)) { if (update_dlg_timer( &dlg->tl, dlg->lifetime )==-1) {

10 years, 4 months

git:master: dialog: added missing semicolon

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: cf6e157bc8a8ce44102bb47f8527e2d663e8c678 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cf6e157… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 8 18:17:19 2014 +0100 dialog: added missing semicolon --- modules/dialog/dlg_handlers.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index 058131b..590e894 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -1259,7 +1259,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) if (timeout!=default_timeout) { dlg->lifetime = timeout; } - reset = !((dlg->iflags & DLG_IFLAG_TIMER_NORESET) || timeout_noreset) + reset = !((dlg->iflags & DLG_IFLAG_TIMER_NORESET) || timeout_noreset); if ((new_state!=DLG_STATE_EARLY) && (old_state!=DLG_STATE_CONFIRMED || reset)) { if (update_dlg_timer( &dlg->tl, dlg->lifetime )==-1) {

10 years, 4 months

git:master: modules/dialog: added parameter and dialog property to disable timeout reset

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: c70823c0454561dda63eb1e95f66bd96605474db URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c70823c… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 8 10:43:00 2014 +0100 modules/dialog: added parameter and dialog property to disable timeout reset --- modules/dialog/dialog.c | 14 ++++++++++++++ modules/dialog/dlg_handlers.c | 7 +++++-- modules/dialog/dlg_hash.h | 1 + 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/modules/dialog/dialog.c b/modules/dialog/dialog.c index 8d7be33..4072981 100644 --- a/modules/dialog/dialog.c +++ b/modules/dialog/dialog.c @@ -123,6 +123,7 @@ int active_dlgs_cnt = 0; int early_dlgs_cnt = 0; int detect_spirals = 1; int dlg_send_bye = 0; +int timeout_noreset = 0; stat_var *active_dlgs = 0; stat_var *processed_dlgs = 0; stat_var *expired_dlgs = 0; @@ -281,6 +282,7 @@ static param_export_t mod_params[]={ { "xavp_cfg", STR_PARAM, &dlg_xavp_cfg.s }, { "ka_timer", INT_PARAM, &dlg_ka_timer }, { "ka_interval", INT_PARAM, &dlg_ka_interval }, + { "timeout_noreset", INT_PARAM, &timeout_noreset }, { 0,0,0 } }; @@ -577,6 +579,11 @@ static int mod_init(void) return -1; } + if (timeout_noreset != 0 && timeout_noreset != 1) { + LM_ERR("invalid value %d for timeout_noreset param!!\n",timeout_noreset); + return -1; + } + /* if statistics are disabled, prevent their registration to core */ if (dlg_enable_stats==0) exports.stats = 0; @@ -1193,6 +1200,13 @@ static int w_dlg_set_property(struct sip_msg *msg, char *prop, char *s2) d->iflags |= DLG_IFLAG_KA_DST; dlg_release(d); } + } else if(val.len==15 && strncmp(val.s, "timeout-noreset", 15)==0) { + dctx->iflags |= DLG_IFLAG_TIMER_NORESET; + d = dlg_get_by_iuid(&dctx->iuid); + if(d!=NULL) { + d->iflags |= DLG_IFLAG_TIMER_NORESET; + dlg_release(d); + } } else { LM_ERR("unknown property value [%.*s]\n", val.len, val.s); return -1; diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index 9393d7f..058131b 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -82,6 +82,7 @@ static int default_timeout; /*!< default dialog timeout */ static int seq_match_mode; /*!< dlg_match mode */ static int shutdown_done = 0; /*!< 1 when destroy_dlg_handlers was called */ extern int detect_spirals; +extern int timeout_noreset; extern int initial_cbs_inscript; extern int dlg_send_bye; extern int dlg_event_rt[DLG_EVENTRT_MAX]; @@ -1085,7 +1086,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) dlg_cell_t *dlg; dlg_iuid_t *iuid; str val, callid, ftag, ttag; - int h_entry, h_id, new_state, old_state, unref, event, timeout; + int h_entry, h_id, new_state, old_state, unref, event, timeout, reset; unsigned int dir; int ret = 0; @@ -1258,7 +1259,9 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) if (timeout!=default_timeout) { dlg->lifetime = timeout; } - if (new_state!=DLG_STATE_EARLY) { + reset = !((dlg->iflags & DLG_IFLAG_TIMER_NORESET) || timeout_noreset) + + if ((new_state!=DLG_STATE_EARLY) && (old_state!=DLG_STATE_CONFIRMED || reset)) { if (update_dlg_timer( &dlg->tl, dlg->lifetime )==-1) { LM_ERR("failed to update dialog lifetime\n"); } else { diff --git a/modules/dialog/dlg_hash.h b/modules/dialog/dlg_hash.h index 4bfc911..6994256 100644 --- a/modules/dialog/dlg_hash.h +++ b/modules/dialog/dlg_hash.h @@ -85,6 +85,7 @@ #define DLG_IFLAG_TIMEOUTBYE (1<<0) /*!< send bye on time-out */ #define DLG_IFLAG_KA_SRC (1<<1) /*!< send keep alive to src */ #define DLG_IFLAG_KA_DST (1<<2) /*!< send keep alive to dst */ +#define DLG_IFLAG_TIMER_NORESET (1<<3) /*!< don't reset dialog timers on in-dialog messages reception */ #define DLG_CALLER_LEG 0 /*!< attribute that belongs to a caller leg */ #define DLG_CALLEE_LEG 1 /*!< attribute that belongs to a callee leg */

10 years, 4 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2014