sr-dev November 2012

sr-dev@lists.kamailio.org

28 participants
122 discussions

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router

by Alex Balashov

Module: sip-router Branch: master Commit: 76885b5c67ca7467d6681b81841f0323dca6ab35 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=76885b5… Author: Alex Balashov <abalashov(a)evaristesys.com> Committer: Alex Balashov <abalashov(a)evaristesys.com> Date: Mon Nov 26 08:18:48 2012 -0500 Merge branch 'master' of ssh://git.sip-router.org/sip-router ---

11 years, 5 months

git:master: dialog(k): Added dlg_set_timeout_by_profile() route script function.

by Alex Balashov

Module: sip-router Branch: master Commit: 17d1934cebd1c96c7f3689be33ccae2a981f6b2c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=17d1934… Author: Alex Balashov <abalashov(a)evaristesys.com> Committer: Alex Balashov <abalashov(a)evaristesys.com> Date: Mon Nov 26 08:17:18 2012 -0500 dialog(k): Added dlg_set_timeout_by_profile() route script function. This function allows the same dialog timeout to be set across all the dialogs in a profile (with or without values). The intended use-case is to allow the user to conditionally end or expire from tracking a user's/caller's/account's calls. --- modules_k/dialog/README | 240 ++++++++++++++++++--------------- modules_k/dialog/dialog.c | 46 ++++++- modules_k/dialog/dlg_hash.c | 21 +++ modules_k/dialog/dlg_hash.h | 6 + modules_k/dialog/dlg_profile.c | 70 ++++++++++- modules_k/dialog/dlg_profile.h | 6 + modules_k/dialog/doc/dialog_admin.xml | 38 +++++ 7 files changed, 312 insertions(+), 115 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=17d…

11 years, 5 months

git:master: Makefile.defs: added MEMMNG to allow selection of memory manager

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 15a0b9c23e4b4f829bbb88f73e8042371f3f38a2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=15a0b9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Nov 26 13:42:07 2012 +0100 Makefile.defs: added MEMMNG to allow selection of memory manager - MEMMNG=0 => fast malloc is used (f_malloc) - MEMMNG=1 => quick malloc is used (q_malloc) - MEMDBG is used now to set the debug mode for each of the managers - 0 - no debug info - 1 - debug info enabled --- Makefile.defs | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index c3d5e54..0a48248 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -164,9 +164,13 @@ PATCHLEVEL = 4 SUBLEVEL = 0 EXTRAVERSION = -dev5 +# memory manager switcher +# 0 - f_malloc (fast malloc) +# 1 - q_malloc (quick malloc) +MEMMNG ?= 0 # memory debugger switcher -# 0 - off (release mode) -# 1 - on (devel mode) +# 0 - off (no-debug mode) +# 1 - on (debug mode) MEMDBG ?= 0 SER_VER = $(shell expr $(VERSION) \* 1000000 + $(PATCHLEVEL) \* 1000 + \ @@ -712,13 +716,22 @@ C_DEFS= $(extra_defs) \ # use make mode=debug all instead. Anyway no by default ser is compiled w/ # debugging symbols in all cases (-g). --andrei -ifeq ($(MEMDBG), 1) - C_DEFS+= -DDBG_QM_MALLOC +# set memory manager and its debug mode +ifeq ($(MEMMNG), 1) +# use q_malloc +ifeq ($(MEMDBG), 1) + C_DEFS+= -DDBG_QM_MALLOC +endif C_DEFS+= -DMEM_JOIN_FREE else +# use f_malloc C_DEFS+= -DF_MALLOC +ifeq ($(MEMDBG), 1) + C_DEFS+= -DDBG_F_MALLOC +endif C_DEFS+= -DMEM_JOIN_FREE endif + ifneq ($(PKG_MEM_SIZE),) C_DEFS+= -DPKG_MEM_SIZE=$(PKG_MEM_SIZE) endif

11 years, 5 months

git:master: mem: check debug info only when joining the next packet

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: cceb39f9fb8a55ab7e43f4a546d3d524f5acccd4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cceb39f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Nov 26 14:14:37 2012 +0100 mem: check debug info only when joining the next packet - it was checked even it was not freeand not the case for a join --- mem/q_malloc.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mem/q_malloc.c b/mem/q_malloc.c index 497c3f9..bfa46fd 100644 --- a/mem/q_malloc.c +++ b/mem/q_malloc.c @@ -488,8 +488,8 @@ void qm_free(struct qm_block* qm, void* p) f->u.nxt_free=(void*)0x1L; /* bogus value, just to mark it as free */ /* join packets if possible*/ next=FRAG_NEXT(f); - if (((char*)next < (char*)qm->last_frag_end) &&( next->u.is_free)){ - /* join */ + if (((char*)next < (char*)qm->last_frag_end) && (next->u.is_free)){ + /* join next packet */ #ifdef DBG_QM_MALLOC qm_debug_frag(qm, next); #endif @@ -503,15 +503,15 @@ void qm_free(struct qm_block* qm, void* p) prev=FRAG_PREV(f); /* (struct qm_frag*)((char*)f - (struct qm_frag_end*)((char*)f- sizeof(struct qm_frag_end))->size);*/ + if (prev->u.is_free){ + /* join prev packet */ #ifdef DBG_QM_MALLOC - qm_debug_frag(qm, prev); + qm_debug_frag(qm, prev); #endif - if (prev->u.is_free){ - /*join*/ qm_detach_free(qm, prev); size+=prev->size+FRAG_OVERHEAD; qm->real_used-=FRAG_OVERHEAD; - qm->free_hash[GET_HASH(prev->size)].no--; /* FIXME slow */ + qm->free_hash[GET_HASH(prev->size)].no--; /* FIXME slow */ f=prev; } }

11 years, 5 months

git:master: Makefile.defs: version set to 3.4.0-dev6

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 45d8d3ccd943caad37570ae013118536d38a8457 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=45d8d3c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Nov 26 13:53:22 2012 +0100 Makefile.defs: version set to 3.4.0-dev6 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index d040f75..c4aab26 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -162,7 +162,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 3 PATCHLEVEL = 4 SUBLEVEL = 0 -EXTRAVERSION = -dev5 +EXTRAVERSION = -dev6 # memory manager switcher # 0 - f_malloc (fast malloc)

11 years, 5 months

git:master: Mkefile.defs: default memory manager set to q_malloc

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d96401668cefade5e251b101eb93f07faae091ad URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d964016… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Nov 26 13:51:53 2012 +0100 Mkefile.defs: default memory manager set to q_malloc - debug option is left unset (no DBG_QM_MALLOC) - lower memory chunk overhead with faster join --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 0a48248..d040f75 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -167,7 +167,7 @@ EXTRAVERSION = -dev5 # memory manager switcher # 0 - f_malloc (fast malloc) # 1 - q_malloc (quick malloc) -MEMMNG ?= 0 +MEMMNG ?= 1 # memory debugger switcher # 0 - off (no-debug mode) # 1 - on (debug mode)

11 years, 5 months

git:3.2: dialog(k): safety check for callid parameter in mi commands

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.2 Commit: 07a7b98cea64fdbde4ac4d75de19b34d351659bb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=07a7b98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Nov 25 21:54:32 2012 +0100 dialog(k): safety check for callid parameter in mi commands - if not provided properly, it may result in crash - reported by Ricardo Martinez (cherry picked from commit 8acb59ee4de31ab76763a021acaf7b5a13e02f23) --- modules_k/dialog/dlg_hash.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index 2dbf9a0..a2fbbdd 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -1042,6 +1042,8 @@ static inline struct mi_root* process_mi_params(struct mi_root *cmd_tree, /* we have params -> get callid and fromtag */ callid = &node->value; + if(callid->s==NULL || callid->len<=0) + return init_mi_tree(400, MI_SSTR(MI_MISSING_PARM)); LM_DBG("callid='%.*s'\n", callid->len, callid->s); node = node->next;

11 years, 5 months

git:3.3: dialog(k): safety check for callid parameter in mi commands

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.3 Commit: 835db0ecde6f401bd77b55e3499fa7cfe452b7ea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=835db0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Nov 25 21:54:32 2012 +0100 dialog(k): safety check for callid parameter in mi commands - if not provided properly, it may result in crash - reported by Ricardo Martinez (cherry picked from commit 8acb59ee4de31ab76763a021acaf7b5a13e02f23) --- modules_k/dialog/dlg_hash.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index 9010139..28468b3 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -1174,6 +1174,8 @@ static inline struct mi_root* process_mi_params(struct mi_root *cmd_tree, /* we have params -> get callid and fromtag */ callid = &node->value; + if(callid->s==NULL || callid->len<=0) + return init_mi_tree(400, MI_SSTR(MI_MISSING_PARM)); LM_DBG("callid='%.*s'\n", callid->len, callid->s); node = node->next;

11 years, 5 months

git:master: dialog(k): safety check for callid parameter in mi commands

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8acb59ee4de31ab76763a021acaf7b5a13e02f23 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8acb59e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Nov 25 21:54:32 2012 +0100 dialog(k): safety check for callid parameter in mi commands - if not provided properly, it may result in crash - reported by Ricardo Martinez --- modules_k/dialog/dlg_hash.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index 9010139..28468b3 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -1174,6 +1174,8 @@ static inline struct mi_root* process_mi_params(struct mi_root *cmd_tree, /* we have params -> get callid and fromtag */ callid = &node->value; + if(callid->s==NULL || callid->len<=0) + return init_mi_tree(400, MI_SSTR(MI_MISSING_PARM)); LM_DBG("callid='%.*s'\n", callid->len, callid->s); node = node->next;

11 years, 5 months

git:master: sanity Sanity-checked spelling. Minor corrections.

by Olle E. Johansson

Module: sip-router Branch: master Commit: d43fbf2a5a5464a4a499282b88d58a1fc97b9c7e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d43fbf2… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Nov 25 16:38:27 2012 +0100 sanity Sanity-checked spelling. Minor corrections. --- modules/sanity/README | 26 +++++++++++++------------- modules/sanity/doc/functions.xml | 4 ++-- modules/sanity/doc/params.xml | 6 +++--- modules/sanity/doc/sanity.xml | 6 +++--- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/sanity/README b/modules/sanity/README index 27bcaa1..6956733 100644 --- a/modules/sanity/README +++ b/modules/sanity/README @@ -26,13 +26,13 @@ Nils Ohlmeier requests which are suggested or even required by a RFC, but are not available yet in the core of SIP-router. - This checks are not required by SIP-router itself for its + These checks are not required by SIP-router itself for its functionality. But on the other side it makes not much sence if a broken request traverses through a SIP network if it is rejected sooner - or later by a SIP device any way. As every sanity cost extra - performance because of additional parsing and evaluation it is now with - this module up to the SIP-router adminstrator which checks should be - done on which request. + or later by a SIP device any way. As every sanity check cost extra + performance because of additional parsing and evaluation it is with + this module now up to the SIP-router adminstrator which checks should + be done on which request. The following checks are available: * ruri sip version - (1) - checks if the SIP version in the request @@ -102,10 +102,10 @@ modparam("sanity", "uri_checks", 3) 1.3.3. proxy_require (string) - This parameter set the list of supported extensions for this - SIP-router. The value is expected as comma separated list of the + This parameter sets the list of supported extensions for this + SIP-router. The value is expected as a comma separated list of extensions. This list is separated into single tokens. Each token from - a proxy require header will be compare to the tokens from this list. + a proxy require header will be compared to the tokens from this list. Example 3. Set proxy_require parameter ... @@ -128,13 +128,13 @@ modparam("sanity", "autodrop", 1) 1.4. Functions -1.4.1. sanity_check([msg_checks [, uri_checks]]) +1.4.1. sanity_check([msg_checks [, uri_checks]]) This function makes a row of sanity checks over the given SIP request. - The behavior of the function is also controled by 'autodrop' parameter. - If autodrop=0, the function returns false (-1) if one of the checks - failed. When autodrop=1, the function stops the execution of - configuration file. In both cases, ff one of the checks fails the + The behavior of the function is also controlled by 'autodrop' + parameter. If autodrop=0, the function returns false (-1) if one of the + checks failed. When autodrop=1, the function stops the execution of + configuration file. In both cases, if one of the checks fails the module sends a precise error reply via SL send_reply(). Thus there is no need to reply with a generic error message. diff --git a/modules/sanity/doc/functions.xml b/modules/sanity/doc/functions.xml index 3a535c2..62d28e6 100644 --- a/modules/sanity/doc/functions.xml +++ b/modules/sanity/doc/functions.xml @@ -20,10 +20,10 @@ </title> <para> This function makes a row of sanity checks over the given SIP request. The - behavior of the function is also controled by 'autodrop' parameter. + behavior of the function is also controlled by 'autodrop' parameter. If autodrop=0, the function returns false (-1) if one of the checks failed. When autodrop=1, the function stops the execution of configuration file. - In both cases, ff one of the checks fails the module sends a precise error + In both cases, if one of the checks fails the module sends a precise error reply via SL send_reply(). Thus there is no need to reply with a generic error message. </para> diff --git a/modules/sanity/doc/params.xml b/modules/sanity/doc/params.xml index 552ec82..037b6f9 100644 --- a/modules/sanity/doc/params.xml +++ b/modules/sanity/doc/params.xml @@ -62,10 +62,10 @@ modparam("sanity", "uri_checks", 3) <section id="proxy_require"> <title><varname>proxy_require</varname> (string)</title> <para> - This parameter set the list of supported extensions for this SIP-router. - The value is expected as comma separated list of the extensions. + This parameter sets the list of supported extensions for this SIP-router. + The value is expected as a comma separated list of extensions. This list is separated into single tokens. Each token from - a proxy require header will be compare to the tokens from this + a proxy require header will be compared to the tokens from this list. </para> <example> diff --git a/modules/sanity/doc/sanity.xml b/modules/sanity/doc/sanity.xml index 1072a48..56127b5 100644 --- a/modules/sanity/doc/sanity.xml +++ b/modules/sanity/doc/sanity.xml @@ -30,12 +30,12 @@ not available yet in the core of SIP-router. </para> <para> - This checks are not required by SIP-router itself for its functionality. + These checks are not required by SIP-router itself for its functionality. But on the other side it makes not much sence if a broken request traverses through a SIP network if it is rejected sooner - or later by a SIP device any way. As every sanity cost extra + or later by a SIP device any way. As every sanity check cost extra performance because of additional parsing and evaluation it - is now with this module up to the SIP-router adminstrator which checks + is with this module now up to the SIP-router adminstrator which checks should be done on which request. </para> <para>

11 years, 5 months

← Newer
1
2
3
4
5
6
7
8
...
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2012