sr-dev August 2011

sr-dev@lists.kamailio.org

33 participants
291 discussions

git:3.1: modules_k/dialog: Simplify and refactor parts of reference counter
by Timo Reimann 26 Aug '11

26 Aug '11

Module: sip-router Branch: 3.1 Commit: 8ff999c7641bf08f0e6d52a14d1f612511525eb3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8ff999c… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Aug 25 15:17:48 2011 +0200 modules_k/dialog: Simplify and refactor parts of reference counter handling. - Remove special handling for dialogs in the "deleted" state to allow accessing such dialogs (e.g., from the configuration script). Besides making the code easier to understand, this also fixes a bug where the reference counter would be decremented after detecting a spiral (dlg_handlers.c) even though get_dlg() does not increment it for "deleted" dialogs. - Adapt interfaces for lookup_dlg() and get_dlg() accordingly, i.e., remove "del" parameter and update in-code documentation. - Replace direct increments on a dialog structure's ref variable by calls to ref_dlg_unsafe(). - Move {un}ref_dlg_unsafe() definitions towards the head of the file to make declaration available earlier. - Improve store_dlg_in_tm(): * Return and evaluate result code. * Replace second register call by passing unreference_dialog() as release function to the first register call. - Document various places in the code dealing with reference counting. (cherry picked from commit f44534cbe841046079e176512b04a6b9c5a68bdc) Conflicts: modules_k/dialog/dlg_handlers.c modules_k/dialog/dlg_hash.c modules_k/dialog/dlg_hash.h --- modules_k/dialog/dialog.c | 5 +- modules_k/dialog/dlg_handlers.c | 97 +++++++-------------------- modules_k/dialog/dlg_hash.c | 133 ++++++++++++++++--------------------- modules_k/dialog/dlg_hash.h | 11 ++- modules_k/dialog/dlg_profile.c | 3 + modules_k/dialog/dlg_req_within.c | 2 +- 6 files changed, 96 insertions(+), 155 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=8ff…

1 0

git:master: modules_k/dialog: Simplify and refactor parts of reference counter
by Timo Reimann 26 Aug '11

26 Aug '11

Module: sip-router Branch: master Commit: f44534cbe841046079e176512b04a6b9c5a68bdc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f44534c… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Aug 25 15:17:48 2011 +0200 modules_k/dialog: Simplify and refactor parts of reference counter handling. - Remove special handling for dialogs in the "deleted" state to allow accessing such dialogs (e.g., from the configuration script). Besides making the code easier to understand, this also fixes a bug where the reference counter would be decremented after detecting a spiral (dlg_handlers.c) even though get_dlg() does not increment it for "deleted" dialogs. - Adapt interfaces for lookup_dlg() and get_dlg() accordingly, i.e., remove "del" parameter and update in-code documentation. - Replace direct increments on a dialog structure's ref variable by calls to ref_dlg_unsafe(). - Move {un}ref_dlg_unsafe() definitions towards the head of the file to make declaration available earlier. - Improve store_dlg_in_tm(): * Return and evaluate result code. * Replace second register call by passing unreference_dialog() as release function to the first register call. - Document various places in the code dealing with reference counting. --- modules_k/dialog/dialog.c | 5 +- modules_k/dialog/dlg_handlers.c | 92 +++++++------------------ modules_k/dialog/dlg_hash.c | 139 +++++++++++++++--------------------- modules_k/dialog/dlg_hash.h | 13 ++-- modules_k/dialog/dlg_profile.c | 3 + modules_k/dialog/dlg_req_within.c | 2 +- 6 files changed, 97 insertions(+), 157 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=f44…

1 0

Patch allowing app_lua lua_run to return values
by Nathan Angelacos 26 Aug '11

26 Aug '11

Enclosed is a small patch that allows lua_run() to return an integer value. If the return value is not an integer, 1 is returned (like is true with current git master.) As a side effect, lua scripts can now exit() the sip-router script by returning 0. Example: Lua script: test_equality = function ( a , b ) if a == b then return 1 else return -1 end sip-router script: if (lua_run("test_equality", "$fU", "$tU")) { xdbg("SCRIPT: The values are equal\n"); }

2 2

git:master: module: sipcapture: Changed SQL schema for partitioning table.
by Alexandr Dubovikov 26 Aug '11

26 Aug '11

Module: sip-router Branch: master Commit: b61b3d2f43108e2f758e3428449cdfadefd4097f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b61b3d2… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Fri Aug 26 17:18:21 2011 +0200 module: sipcapture: Changed SQL schema for partitioning table. Bug fix: mySQL doesn't support DAYOFWEEK rushing. Changed to RANGE condition: TO_DAYS and UNIX_TIMESTAMP. The last one, only for mySQL => 5.1.58 The two crontab scripts are in example directory. --- modules/sipcapture/examples/crontabtruncate.pl | 8 ++- modules/sipcapture/examples/partrotate_todays.pl | 86 ++++++++++++++++++ .../examples/partrotate_unixtimestamp.pl | 93 ++++++++++++++++++++ .../sipcapture/sql/create_part_unixtimestamp.sql | 86 ++++++++++++++++++ modules/sipcapture/sql/sipcapture-create.sql | 41 ++++----- 5 files changed, 291 insertions(+), 23 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=b61…

1 0

git:treimann/3.1/robust_ref_count: modules_k/dialog: Robustify reference counting.
by Timo Reimann 26 Aug '11

26 Aug '11

Module: sip-router Branch: treimann/3.1/robust_ref_count Commit: fa6f1ae06e1e3ece9e2497871b5b021be0730258 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fa6f1ae… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Fri Aug 26 15:33:49 2011 +0200 modules_k/dialog: Robustify reference counting. - Remove special handling for dialogs in the "deleted" state to allow accessing such dialogs (e.g., from the configuration script). As a side effect, this also removes a bug where the reference counter would be decremented after detecting a spiral (dlg_handlers.c) although get_dlg() does not increment it for "deleted" dialogs. - Adapt interfaces for lookup_dlg() and get_dlg() accordingly, i.e., remove "del" parameter and update in-code documentation. - Replace direct increments on a dialog structure's ref variable by calls to ref_dlg_unsafe(). - Move {un}ref_dlg_unsafe() definitions towards the head of the file to make declaration available sooner. - Improve store_dlg_in_tm(): * Return and evaluate result code. * Replace second register call by specifying a release function to the first register call. - Document various places in the code dealing with reference counter. (cherry picked from commit 37f9ff35e47a6ed6e4037ca09430115f0b4d6df4) Conflicts: modules_k/dialog/dlg_handlers.c modules_k/dialog/dlg_hash.c modules_k/dialog/dlg_hash.h --- modules_k/dialog/dialog.c | 5 +- modules_k/dialog/dlg_handlers.c | 97 +++++++-------------------- modules_k/dialog/dlg_hash.c | 133 ++++++++++++++++--------------------- modules_k/dialog/dlg_hash.h | 11 ++- modules_k/dialog/dlg_profile.c | 3 + modules_k/dialog/dlg_req_within.c | 2 +- 6 files changed, 96 insertions(+), 155 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=fa6…

1 0

git:master: core:mem: short status dumping
by Daniel-Constantin Mierla 26 Aug '11

26 Aug '11

Module: sip-router Branch: master Commit: c191f7b603a67f609cb9fe8adf0fc91f99bf9e33 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c191f7b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 26 09:32:51 2011 +0200 core:mem: short status dumping - patch by Andrade Ricardo, on Aug 1, 2011 --- cfg_core.c | 7 ++++--- doc/cfg_list/docbook/cfg_core.xml | 6 ++++-- mem/f_malloc.c | 5 +++++ mem/ll_malloc.c | 5 +++++ mem/q_malloc.c | 5 ++++- 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/cfg_core.c b/cfg_core.c index 03605ee..27a55b3 100644 --- a/cfg_core.c +++ b/cfg_core.c @@ -120,7 +120,7 @@ struct cfg_group_core default_core_cfg = { 0, /*!< force_rport */ L_DBG, /*!< memlog */ 3, /*!< mem_summary -flags: 0 off, 1 pkg_status, 2 shm_status, - 4 pkg_sums, 8 shm_sums */ + 4 pkg_sums, 8 shm_sums, 16 short_status */ L_ERR /*!< corelog */ }; @@ -301,13 +301,14 @@ cfg_def_t core_cfg_def[] = { "force rport for all the received messages" }, {"memlog", CFG_VAR_INT|CFG_ATOMIC, 0, 0, 0, 0, "log level for memory status/summary information"}, - {"mem_summary", CFG_VAR_INT|CFG_ATOMIC, 0, 15, 0, 0, + {"mem_summary", CFG_VAR_INT|CFG_ATOMIC, 0, 31, 0, 0, "memory debugging information displayed on exit (flags): " " 0 - off," " 1 - dump all the pkg used blocks (status)," " 2 - dump all the shm used blocks (status)," " 4 - summary of pkg used blocks," - " 8 - summary of shm used blocks" }, + " 8 - summary of shm used blocks," + " 16 - short status instead of dump" }, {"corelog", CFG_VAR_INT|CFG_ATOMIC, 0, 0, 0, 0, "log level for non-critical core error messages"}, {0, 0, 0, 0, 0, 0} diff --git a/doc/cfg_list/docbook/cfg_core.xml b/doc/cfg_list/docbook/cfg_core.xml index c2ed233..04b5c7c 100644 --- a/doc/cfg_list/docbook/cfg_core.xml +++ b/doc/cfg_list/docbook/cfg_core.xml @@ -511,10 +511,12 @@ memory debugging information displayed on exit (flags): 0 - off, 1 - dump all the pkg used blocks (status), 2 - dump all the shm used blocks (status), 4 - summary of pkg used blocks, 8 - - summary of shm used blocks. + - summary of shm used blocks, 16 - show only summary of used + blocks instead of full dump (to use in conjuntion with flags 1 + and 2). </para> <para>Default value: 3.</para> - <para>Range: 0 - 15.</para> + <para>Range: 0 - 31.</para> <para>Type: integer.</para> <para> </para> diff --git a/mem/f_malloc.c b/mem/f_malloc.c index be25546..7beb3e2 100644 --- a/mem/f_malloc.c +++ b/mem/f_malloc.c @@ -667,8 +667,10 @@ void fm_status(struct fm_block* qm) int unused; unsigned long size; int memlog; + int mem_summary; memlog=cfg_get(core, core_cfg, memlog); + mem_summary=cfg_get(core, core_cfg, mem_summary); LOG_(DEFAULT_FACILITY, memlog, "fm_status: ", "fm_status (%p):\n", qm); if (!qm) return; @@ -681,6 +683,9 @@ void fm_status(struct fm_block* qm) LOG_(DEFAULT_FACILITY, memlog, "fm_status: ", " max used (+overhead)= %lu\n", qm->max_real_used); #endif + + if (mem_summary & 16) return; + /* LOG_(DEFAULT_FACILITY, memlog, "fm_status: ", "dumping all fragments:\n"); for (f=qm->first_frag, i=0;((char*)f<(char*)qm->last_frag) && (i<10); diff --git a/mem/ll_malloc.c b/mem/ll_malloc.c index 11c8800..2a46c8a 100644 --- a/mem/ll_malloc.c +++ b/mem/ll_malloc.c @@ -971,14 +971,19 @@ void sfm_status(struct sfm_block* qm) unsigned long size; int k; int memlog; + int mem_summary; #warning "ll_status doesn't work (might crash if used)" memlog=cfg_get(core, core_cfg, memlog); + mem_summary=cfg_get(core, core_cfg, mem_summary); LOG(memlog, "sfm_status (%p):\n", qm); if (!qm) return; LOG(memlog, " heap size= %ld\n", qm->size); + + if (mem_summary & 16) return; + LOG(memlog, "dumping free list:\n"); for(h=0,i=0,size=0;h<=sfm_max_hash;h++){ SFM_MAIN_HASH_LOCK(qm, h); diff --git a/mem/q_malloc.c b/mem/q_malloc.c index 895cbfc..76bf938 100644 --- a/mem/q_malloc.c +++ b/mem/q_malloc.c @@ -716,9 +716,10 @@ void qm_status(struct qm_block* qm) int h; int unused; int memlog; - + int mem_summary; memlog=cfg_get(core, core_cfg, memlog); + mem_summary=cfg_get(core, core_cfg, mem_summary); LOG_(DEFAULT_FACILITY, memlog, "qm_status: ", "(%p):\n", qm); if (!qm) return; @@ -730,6 +731,8 @@ void qm_status(struct qm_block* qm) LOG_(DEFAULT_FACILITY, memlog, "qm_status: ", "max used (+overhead)= %lu\n", qm->max_real_used); + if (mem_summary & 16) return; + LOG_(DEFAULT_FACILITY, memlog, "qm_status: ", "dumping all alloc'ed. fragments:\n"); for (f=qm->first_frag, i=0;(char*)f<(char*)qm->last_frag_end;f=FRAG_NEXT(f)

1 0

[tracker] Task opened: handle dialog tracking properly when non-failing 4xx responses are involved
by sip-router 25 Aug '11

25 Aug '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Timo Reimann (tr) Attached to Project - sip-router Summary - handle dialog tracking properly when non-failing 4xx responses are involved Task Type - Bug Report Category - dialog Status - Assigned Assigned To - Timo Reimann Operating System - All Severity - Medium Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - When a dialog is tracked that returns a response containing any of the response codes defined in section 8.1.3.5 of RFC 3261[1], the standard requires (according to section 8.1.1.4[2]) that the dialog must *not* be considered as a failure. A typical example call flow involves client authentication: INVITE(no-auth) -> 407 -> ACK -> INVITE(auth) -> ... If the dialog is already tracked at the unauthenticated INVITE the module will consider the dialog to have failed on routing of the 407 message. Instead, it should facilitate "reusing" the dialog once the authenticated INVITE arrives and tracking the call properly. A suggested fix is to adjust the state machine to exclude the set of non-failing 4xx return codes from constituting a DLG_STATE_FAILED state and continue tracking when the authenticated INVITE is parsed. Caution must be taken in conjunction with the spiral detection code to implement this properly. [1] http://tools.ietf.org/html/rfc3261#section-8.1.3.5 [2] http://tools.ietf.org/html/rfc3261#section-8.1.1.4 More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=146 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:3.1: modules_k/dialog: Provide in-code documentation for tricky part in
by Timo Reimann 25 Aug '11

25 Aug '11

Module: sip-router Branch: 3.1 Commit: 084da0afc666fef6f92c00754bbfb3c192751ff6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=084da0a… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Aug 25 13:26:32 2011 +0200 modules_k/dialog: Provide in-code documentation for tricky part in dlg_new_dialog(). (cherry picked from commit d903b7707d1f9c5ecb4110de9ab9d8a573a6f8cd) --- modules_k/dialog/dlg_handlers.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 3942b44..471f470 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -796,10 +796,14 @@ finish: ref_dlg(dlg, 1); if (t) { + // transaction exists ==> keep ref counter large enough to + // avoid premature cleanup and ensure proper dialog referencing store_dlg_in_tm( msg, t, dlg); } else { + // no transaction exists ==> postpone work until we see the + // request being forwarded statefully if ( d_tmb.register_tmcb( msg, NULL, TMCB_REQUEST_FWDED, store_dlg_in_tm_cb, (void*)dlg, NULL)<0 ) { LM_ERR("failed to store dialog in transaction during dialog creation for later reference\n");

1 0

git:master: modules_k/dialog: Provide in-code documentation for tricky part in
by Timo Reimann 25 Aug '11

25 Aug '11

Module: sip-router Branch: master Commit: d903b7707d1f9c5ecb4110de9ab9d8a573a6f8cd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d903b77… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Aug 25 13:19:13 2011 +0200 modules_k/dialog: Provide in-code documentation for tricky part in dlg_new_dialog(). --- modules_k/dialog/dlg_handlers.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index c6cd650..60ae3a0 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -886,10 +886,14 @@ finish: ref_dlg(dlg, 1); if (t) { + // transaction exists ==> keep ref counter large enough to + // avoid premature cleanup and ensure proper dialog referencing store_dlg_in_tm( req, t, dlg); } else { + // no transaction exists ==> postpone work until we see the + // request being forwarded statefully if ( d_tmb.register_tmcb( req, NULL, TMCB_REQUEST_FWDED, store_dlg_in_tm_cb, (void*)dlg, NULL)<0 ) { LM_ERR("failed to store dialog in transaction during dialog creation for later reference\n");

1 0

ideas on dialog spiral distinction
by Jason Penton 25 Aug '11

25 Aug '11

Hi Guys, Have been playing around with the dialog module and spiralling and one thing I have noticed is that if you spiral and dont have detect_spirals enabled the dialog module will create 2 dialogs. This is great and 'expected' in this case. However, as it stands there is no way of distinguishing between the 2 dialogs. So for example, a BYE could come in from either 'side' of the spiral and the first dialog is matched - not necessarily the correct one. this is because the match is purely done on callid, from and to tags (if using RFC3261 matching). My initial thought is to have some sort of direction identifiers stored in the dialog structure itself. Then using Via and contact headers we can make a pretty good assumption as to which 'end' of the spiral and therefore choose the correct dialog in the match algorithm. some may say just enable spiral_detection. Actually, in some cases it is nice to be able to track a spiral in different dialogs, which most likely why the option to enable or disable spiral detection in the first place What are your thoughts?

6 17

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2011