sr-dev August 2011

sr-dev@lists.kamailio.org

33 participants
291 discussions

git:jh/mtree: modules/mtree: mtree enhancements

by Juha Heinanen

Module: sip-router Branch: jh/mtree Commit: 54335d6730328f7ff3d5dea8549a52f47f04416d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=54335d6… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun Aug 28 15:46:44 2011 +0300 modules/mtree: mtree enhancements - Added integer tree payload type with type value 2. - Same prefix can have multiple payload values if mt_allow_duplicates module parameter has value 1. --- lib/srdb1/schema/mtree.xml | 3 +- lib/srdb1/schema/mtrees.xml | 3 +- modules/mtree/README | 44 +++++--- modules/mtree/doc/mtree_admin.xml | 28 ++++- modules/mtree/mtree.c | 218 ++++++++++++++++++++++--------------- modules/mtree/mtree.h | 27 +++-- modules/mtree/mtree_mod.c | 27 ++++- 7 files changed, 227 insertions(+), 123 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=543…

12 years, 7 months

git:master: modules/mtree: removed unused variable.

by Juha Heinanen

Module: sip-router Branch: master Commit: 1b3cc04023100e3c27d130002dc03c4bf33e21ff URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1b3cc04… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun Aug 28 15:36:56 2011 +0300 modules/mtree: removed unused variable. --- modules/mtree/mtree.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/mtree/mtree.c b/modules/mtree/mtree.c index 6be1481..b2ad347 100644 --- a/modules/mtree/mtree.c +++ b/modules/mtree/mtree.c @@ -314,7 +314,7 @@ str* mt_get_tvalue(m_tree_t *pt, str *tomatch, int *plen) int mt_add_tvalues(struct sip_msg *msg, m_tree_t *pt, str *tomatch) { - int l, len; + int l; mt_node_t *itn; int_str val, values_avp_name; unsigned short values_name_type; @@ -330,7 +330,7 @@ int mt_add_tvalues(struct sip_msg *msg, m_tree_t *pt, str *tomatch) return -1; } - l = len = 0; + l = 0; itn = pt->head; while (itn != NULL && l < tomatch->len && l < MT_MAX_DEPTH) { @@ -347,7 +347,6 @@ int mt_add_tvalues(struct sip_msg *msg, m_tree_t *pt, str *tomatch) values_avp_name.s.len, values_avp_name.s.s, val.s.len, val.s.s); add_avp(values_name_type|AVP_VAL_STR, values_avp_name, val); - len = l+1; } itn = itn[_mt_char_table[(unsigned int)tomatch->s[l]]].child;

12 years, 7 months

[tracker] Comment added: Kamailio 3.1.3 crash

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#122 - Kamailio 3.1.3 crash User who did this - Timo Reimann (tr) ---------- @Jasmin: Over the last couple of days, I added a few patches to the dialog module. One of them improves dlg_manage() to deal with spiral detection properly. The code is part of the master and latest 3.1 branches. @Marius: Is the "quick and dirty" fix to the initial problem part of upstream now so that we can close this bug? If not, you may want to consider renaming the report's topic to something more meaningful that mirrors the real cause of the problem (which you had analyzed quite thoroughly here). ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=122#comment253 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.

12 years, 7 months

[tracker] Task closed: DLGCB_CONFIRMED triggered on 200/OK, not ACK

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#143 - DLGCB_CONFIRMED triggered on 200/OK, not ACK User who did this - Timo Reimann (tr) Reason for closing: Fixed Additional comments about closing: Fixed in commit 934adcfb9, to be shipped in SIP Router 3.2. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=143 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.

12 years, 7 months

git:3.1: modules_k/dialog When hash_size was smaller then 1, consider this as a value(1 == 2^0)

by Timo Reimann

Module: sip-router Branch: 3.1 Commit: 18881421102eaac97c85d84cbbd1597c3f342d23 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1888142… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Wed Aug 17 15:00:00 2011 +0300 modules_k/dialog When hash_size was smaller then 1, consider this as a value(1 == 2^0) The 1<<(n-1) check for the power of two smaller than the given number doesn't work for n == 0 (undefined behavior), so values of dlg_hash_size smaller than 1 where not checked correctly. (cherry picked from commit 11033b05be673593a87afdc2a1d8a2c887fb9ab7) --- modules_k/dialog/dialog.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index 2c63d87..38a30b5 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -559,11 +559,18 @@ static int mod_init(void) return -1; } + /* sanitize dlg_hash_zie */ + if (dlg_hash_size < 1){ + LM_WARN("hash_size is smaller " + "then 1 -> rounding from %d to 1\n", + dlg_hash_size); + dlg_hash_size = 1; + } /* initialized the hash table */ for( n=0 ; n<(8*sizeof(n)) ; n++) { if (dlg_hash_size==(1<<n)) break; - if (dlg_hash_size<(1<<n)) { + if (n && dlg_hash_size<(1<<n)) { LM_WARN("hash_size is not a power " "of 2 as it should be -> rounding from %d to %d\n", dlg_hash_size, 1<<(n-1));

12 years, 7 months

git:master: modules_k/dialog: Remove old parameter "del" from interface

by Timo Reimann

Module: sip-router Branch: master Commit: 99db13c459888a2a7e8ac4af0fc7642541ba5ccb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=99db13c… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Sat Aug 27 02:41:51 2011 +0200 modules_k/dialog: Remove old parameter "del" from interface description. --- modules_k/dialog/dlg_hash.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index 0aee562..35e5bc1 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -472,7 +472,6 @@ not_found: * \param ftag from tag * \param ttag to tag * \param dir direction - * \param del will set to 1 if dialog is deleted * \return dialog structure on success, NULL on failure */ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry,

12 years, 7 months

git:3.1: modules_k/dialog: Fix commit backport mistakes in dlg_handlers.c

by Timo Reimann

Module: sip-router Branch: 3.1 Commit: cb21425e6fa9e824a51b44829b0ad9d9bf9beb99 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cb21425… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Sat Aug 27 02:20:00 2011 +0200 modules_k/dialog: Fix commit backport mistakes in dlg_handlers.c causing compiler run to fail. - Add and set missing "spiral_detected" flag variable. - Use correct SIP message variable name (req -> msg). --- modules_k/dialog/dlg_handlers.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 3500fad..89fb0b3 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -664,6 +664,7 @@ int dlg_new_dialog(struct sip_msg *msg, struct cell *t) str ttag; str req_uri; unsigned int dir; + int spiral_detected; if(current_dlg_pointer != NULL) return -1; @@ -694,6 +695,7 @@ int dlg_new_dialog(struct sip_msg *msg, struct cell *t) { LM_DBG("Callid '%.*s' found, must be a spiraled request\n", callid.len, callid.s); + spiral_detected = 1; run_dlg_callbacks( DLGCB_SPIRALED, dlg, msg, DLG_DIR_DOWNSTREAM, 0); @@ -702,6 +704,7 @@ int dlg_new_dialog(struct sip_msg *msg, struct cell *t) goto finish; } } + spiral_detected = 0; dlg = build_new_dlg (&callid /*callid*/, &(get_from(msg)->uri) /*from uri*/, @@ -775,7 +778,7 @@ finish: } } - set_current_dialog(req, dlg); + set_current_dialog(msg, dlg); _dlg_ctx.dlg = dlg; ref_dlg(dlg, 1);

12 years, 7 months

git:3.1: modules_k/dialog: Improve error handling during dialog creation.

by Timo Reimann

Module: sip-router Branch: 3.1 Commit: d5e90ab587746a39c9be44d9f9f1c325b8d4902d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d5e90ab… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Sat Aug 27 01:44:03 2011 +0200 modules_k/dialog: Improve error handling during dialog creation. - Set current dialog only after all other setup work succeeded. (Eliminates call to profile_cleanup() and guarantees that dialog profiling does not yield to segfault if dialog creation fails for certain reasons.) - During error handling, refrain from decrementing the reference counter for dialog linking if this is a spiraled request (because positive spiral detection skips the linkage code path). (cherry picked from commit 71dd754818d8c3ec304298f1002a45889c2da0aa) Conflicts: modules_k/dialog/dlg_handlers.c --- modules_k/dialog/dlg_handlers.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 16eda6c..3500fad 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -757,10 +757,6 @@ int dlg_new_dialog(struct sip_msg *msg, struct cell *t) if_update_stat( dlg_enable_stats, processed_dlgs, 1); finish: - set_current_dialog(msg, dlg); - _dlg_ctx.dlg = dlg; - ref_dlg(dlg, 1); - if (t) { // transaction exists ==> keep ref counter large enough to // avoid premature cleanup and ensure proper dialog referencing @@ -779,10 +775,15 @@ finish: } } + set_current_dialog(req, dlg); + _dlg_ctx.dlg = dlg; + ref_dlg(dlg, 1); + return 0; + error: - unref_dlg(dlg,1); // undo ref regarding linking - profile_cleanup(msg, 0, NULL); // undo ref regarding setting current dialog + if (!spiral_detected) + unref_dlg(dlg,1); // undo ref regarding linking return -1; }

12 years, 7 months

git:master: modules_k/dialog: Improve error handling during dialog creation .

by Timo Reimann

Module: sip-router Branch: master Commit: 71dd754818d8c3ec304298f1002a45889c2da0aa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=71dd754… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Sat Aug 27 01:32:49 2011 +0200 modules_k/dialog: Improve error handling during dialog creation. - Set current dialog only after all other setup work succeeded. (Eliminates call to profile_cleanup() and guarantees that dialog profiling does not yield to segfault if dialog creation fails for certain reasons.) - During error handling, refrain from decrementing the reference counter for dialog linking if this is a spiraled request (because positive spiral detection skips the linkage code path). --- modules_k/dialog/dlg_handlers.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 4951515..a5eb007 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -846,11 +846,6 @@ int dlg_new_dialog(struct sip_msg *req, struct cell *t, const int run_initial_cb if_update_stat( dlg_enable_stats, processed_dlgs, 1); finish: - - set_current_dialog(req, dlg); - _dlg_ctx.dlg = dlg; - ref_dlg(dlg, 1); - if (t) { // transaction exists ==> keep ref counter large enough to // avoid premature cleanup and ensure proper dialog referencing @@ -870,10 +865,15 @@ finish: } } + set_current_dialog(req, dlg); + _dlg_ctx.dlg = dlg; + ref_dlg(dlg, 1); + return 0; + error: - unref_dlg(dlg,1); // undo ref regarding linking - profile_cleanup(req, 0, NULL); // undo ref regarding setting current dialog + if (!spiral_detected) + unref_dlg(dlg,1); // undo ref regarding linking return -1; }

12 years, 7 months

git:treimann/3.1/robust_ref_count DELETED: modules_k/dialog: Robustify reference counting.

by Timo Reimann

Module: sip-router Branch: treimann/3.1/robust_ref_count DELETED 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…

12 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2011