sr-dev July 2010

sr-dev@lists.kamailio.org

29 participants
223 discussions

git:kamailio_3.0: modules_k/dialog: Prevent "unable to find dialog" WARN messages

by Timo Reimann

Module: sip-router Branch: kamailio_3.0 Commit: 62e4b3d0e1aef798189b50cc869e540b9deff50b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=62e4b3d… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Tue Jul 27 14:37:06 2010 +0200 modules_k/dialog: Prevent "unable to find dialog" WARN messages caused by accessing a dialog in the "deleted" state (often happens with simultaneous BYE requests when both UAs hang up at the same time). - Move POINTER_CLOSED_MARKER from dlg_cb.c into dlg_hash.h for common usage. - in lookup_dlg() and internal_get_dlg(), return POINTER_CLOSED_MARKER when dialog is found but in the DLG_STATE_DELETED state. - in dlg_onroute(), abort request processing if dialog is found to be in the "deleted" state. (cherry picked from commit 9b7f25d7196e41cbcc77c1d6e316cb1a8664ed81) --- modules_k/dialog/dlg_cb.c | 2 -- modules_k/dialog/dlg_handlers.c | 6 +++++- modules_k/dialog/dlg_hash.c | 7 ++++--- modules_k/dialog/dlg_hash.h | 2 ++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/modules_k/dialog/dlg_cb.c b/modules_k/dialog/dlg_cb.c index 24b3b39..464083e 100644 --- a/modules_k/dialog/dlg_cb.c +++ b/modules_k/dialog/dlg_cb.c @@ -43,8 +43,6 @@ static struct dlg_head_cbl* load_cbs = 0; static struct dlg_cb_params params = {NULL, DLG_DIR_NONE, NULL, NULL}; -#define POINTER_CLOSED_MARKER ((void *)(-1)) - static void run_load_callback(struct dlg_callback *cb); diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 976ac0f..a3610cc 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -824,7 +824,11 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) return; dlg = lookup_dlg( h_entry, h_id); - if (dlg==0) { + if (dlg == POINTER_CLOSED_MARKER) { + LM_DBG("dialog marked for destruction, ignoring\n"); + return; + } + else if (dlg==0) { LM_WARN("unable to find dialog for %.*s " "with route param '%.*s' [%u:%u]\n", req->first_line.u.request.method.len, diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index 6df21e3..b3d626b 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -378,7 +378,8 @@ struct dlg_cell* lookup_dlg( unsigned int h_entry, unsigned int h_id) if (dlg->h_id == h_id) { if (dlg->state==DLG_STATE_DELETED) { dlg_unlock( d_table, d_entry); - goto not_found; + LM_DBG("dialog id=%u on entry %u marked for deletion\n", h_id, h_entry); + return POINTER_CLOSED_MARKER; } dlg->ref++; LM_DBG("ref dlg %p with 1 -> %d\n", dlg, dlg->ref); @@ -418,8 +419,9 @@ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry, /* Check callid / fromtag / totag */ if (match_dialog( dlg, callid, ftag, ttag, dir)==1) { if (dlg->state==DLG_STATE_DELETED) { + LM_DBG("dialog callid='%.*s' marked for deletion\n", callid->len, callid->s); dlg_unlock( d_table, d_entry); - goto not_found; + return POINTER_CLOSED_MARKER; } dlg->ref++; LM_DBG("ref dlg %p with 1 -> %d\n", dlg, dlg->ref); @@ -432,7 +434,6 @@ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry, dlg_unlock( d_table, d_entry); -not_found: LM_DBG("no dialog callid='%.*s' found\n", callid->len, callid->s); return 0; } diff --git a/modules_k/dialog/dlg_hash.h b/modules_k/dialog/dlg_hash.h index 889a318..6aa6db5 100644 --- a/modules_k/dialog/dlg_hash.h +++ b/modules_k/dialog/dlg_hash.h @@ -83,6 +83,8 @@ #define DLG_DIR_DOWNSTREAM 1 /*!< dialog has downstream direction */ #define DLG_DIR_UPSTREAM 2 /*!< dialog has upstream direction */ +#define POINTER_CLOSED_MARKER ((void *)(-1)) + /*! entries in the dialog list */ struct dlg_cell

14 years, 4 months

git:kamailio_3.0: modules_k/dialog: Move comment regarding dialog-destroying

by Timo Reimann

Module: sip-router Branch: kamailio_3.0 Commit: 40c00244f872e8af270cf26d4e3b9f48d3958ced URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=40c0024… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Tue Jul 27 14:06:11 2010 +0200 modules_k/dialog: Move comment regarding dialog-destroying unreference operation to proper new location. (cherry picked from commit 191cc1d6437a252516d76c6249aa701a5b39b4e4) --- modules_k/dialog/dlg_handlers.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 19b53e9..976ac0f 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -773,6 +773,7 @@ static void unref_dlg_from_cb(struct cell* t, int type, struct tmcb_params *para { struct dlg_cell *dlg = (struct dlg_cell *)(*param->param); + /* destroy dialog */ unref_dlg(dlg, 1); } @@ -941,7 +942,6 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) if (dlg_db_mode) remove_dialog_from_db(dlg); - /* destroy dialog */ unref_dlg(dlg, unref); if_update_stat( dlg_enable_stats, active_dlgs, -1);

14 years, 4 months

SF.net SVN: openser:[6026] branches/1.5/modules/registrar

by Henning Westerholt

Revision: 6026 http://openser.svn.sourceforge.net/openser/?rev=6026&view=rev Author: henningw Date: 2010-07-27 12:53:52 +0000 (Tue, 27 Jul 2010) Log Message: ----------- * extend notes about the case_sensitive parameter Modified Paths: -------------- branches/1.5/modules/registrar/README branches/1.5/modules/registrar/doc/registrar_admin.xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 4 months

[tracker] Comment added: patch to add method masking to xlog function

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#81 - patch to add method masking to xlog function User who did this - Juha Heinanen (jh) ---------- the patch that i created does not affect any existing configs, because method_mask param defaults to -1, which turns off method masking. i could add another function, but there would need to be more than one of them plus most of the code would just be a copy of existing functions, which i don't see an appealing solution. the only overhead that that patch introduces is c if statement against an int var being null, which i consider so small that it does not warrant any new functions. -- juha ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=81#comment102 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.

14 years, 4 months

SF.net SVN: openser:[6025] branches/1.5/modules/dialog/dlg_handlers.c

by Timo Reimann

Revision: 6025 http://openser.svn.sourceforge.net/openser/?rev=6025&view=rev Author: timoreimann Date: 2010-07-27 12:09:14 +0000 (Tue, 27 Jul 2010) Log Message: ----------- modules/dialog: Move comment regarding dialog-destroying unreference operation to proper new location. Modified Paths: -------------- branches/1.5/modules/dialog/dlg_handlers.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 4 months

git:master: modules_k/dialog: Move comment regarding dialog-destroying

by Timo Reimann

Module: sip-router Branch: master Commit: 191cc1d6437a252516d76c6249aa701a5b39b4e4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=191cc1d… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Tue Jul 27 14:06:11 2010 +0200 modules_k/dialog: Move comment regarding dialog-destroying unreference operation to proper new location. --- modules_k/dialog/dlg_handlers.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 19b53e9..976ac0f 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -773,6 +773,7 @@ static void unref_dlg_from_cb(struct cell* t, int type, struct tmcb_params *para { struct dlg_cell *dlg = (struct dlg_cell *)(*param->param); + /* destroy dialog */ unref_dlg(dlg, 1); } @@ -941,7 +942,6 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) if (dlg_db_mode) remove_dialog_from_db(dlg); - /* destroy dialog */ unref_dlg(dlg, unref); if_update_stat( dlg_enable_stats, active_dlgs, -1);

14 years, 4 months

[tracker] Comment added: patch to add method masking to xlog function

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#81 - patch to add method masking to xlog function User who did this - Daniel-Constantin Mierla (miconda) ---------- I am not the owner of the module, anyway anyone is welcome to comment, plus that this is one change that impacts every config :-) . Why you don't add a new function xlogf() - the function that will evaluate built-in filters before printing. In the future someone might desire other type of filters. Also, just a suggestion, I saw you added dedicated rpc function to change the filters - while this is fine, there is now the cfg parameter framework which seems to be built for such cases (changing core/module parameters at runtime with smallest impact). I think Marius converted some parameters of registrar(k) module. Maybe you check this option and see if is more appropriate here as well. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=81#comment101 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.

14 years, 4 months

[tracker] Comment added: presence_xml with db_postgres

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#77 - presence_xml with db_postgres User who did this - Daniel-Constantin Mierla (miconda) ---------- I think as well that len should be kept untouched (shouldn't include the '\0'). Also AVPs with str value are 0-terminated, but the len does not reflect it. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=77#comment100 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.

14 years, 4 months

[tracker] Comment added: presence_xml with db_postgres

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#77 - presence_xml with db_postgres User who did this - Andrey A Berekelya (bandry) ---------- I am a bit mistaken. To work properly you must remove the patch line: VAL_BLOB(_v).len++; It should work correctly with null results. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=77#comment99 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.

14 years, 4 months

git:kamailio_3.0: Revert "db_postgres(old API) FS#77: fix BLOBs with postgres"

by Henning Westerholt

Module: sip-router Branch: kamailio_3.0 Commit: c3964dbca625de202db16ae6a4f9ea91128ccb48 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c3964db… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jul 26 19:02:04 2010 +0200 Revert "db_postgres(old API) FS#77: fix BLOBs with postgres" This reverts commit a6141a32738b8610c70ba7e0a88c0d79561cb7a6. --- modules/db_postgres/km_val.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/db_postgres/km_val.c b/modules/db_postgres/km_val.c index 9faa5b5..cb3fe9f 100644 --- a/modules/db_postgres/km_val.c +++ b/modules/db_postgres/km_val.c @@ -72,18 +72,16 @@ int db_postgres_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const LM_ERR("PQunescapeBytea failed\n"); return -7; } - VAL_BLOB(_v).s = pkg_malloc(VAL_BLOB(_v).len + 1); + VAL_BLOB(_v).s = pkg_malloc(VAL_BLOB(_v).len); if (VAL_BLOB(_v).s == NULL) { LM_ERR("no private memory left\n"); PQfreemem(tmp_s); return -8; } - LM_DBG("allocate %d bytes memory for BLOB at %p", VAL_BLOB(_v).len + 1, VAL_BLOB(_v).s); + LM_DBG("allocate %d bytes memory for BLOB at %p", VAL_BLOB(_v).len, VAL_BLOB(_v).s); memcpy(VAL_BLOB(_v).s, tmp_s, VAL_BLOB(_v).len); PQfreemem(tmp_s); - VAL_BLOB(_v).s[VAL_BLOB(_v).len] = '\0'; - VAL_BLOB(_v).len++; VAL_TYPE(_v) = DB1_BLOB; VAL_FREE(_v) = 1;

14 years, 4 months

← Newer
1
...
5
6
7
8
9
10
11
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2010