sr-dev July 2010

sr-dev@lists.kamailio.org

29 participants
223 discussions

SF.net SVN: openser:[6020] branches/1.5/modules/dialog/dlg_handlers.c
by timoreimann＠users.sourceforge.net 13 Jul '10

13 Jul '10

Revision: 6020 http://openser.svn.sourceforge.net/openser/?rev=6020&view=rev Author: timoreimann Date: 2010-07-13 18:31:40 +0000 (Tue, 13 Jul 2010) Log Message: ----------- modules_k/dialog: Delay dialog deletion to absorb late in-dialog requests - When a dialog's state transitions to DLG_STATE_DELETED, register a tm callback for TMCB_TRANS_DELETED to absorb late in-dialog requests (no more "unable to find dialog for <REQUEST TYPE>" log messages). - On callback, unreference and, in consequence, destroy the dialog. 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.

1 0

git:kamailio_3.0: modules_k/dialog: Delay dialog deletion to absorb late in-dialog
by Timo Reimann 13 Jul '10

13 Jul '10

Module: sip-router Branch: kamailio_3.0 Commit: 24877089b48cdbf9389981c0e9285e6a3a1ce6c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2487708… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Mon Jun 28 10:50:05 2010 +0200 modules_k/dialog: Delay dialog deletion to absorb late in-dialog requests - When a dialog's state transitions to DLG_STATE_DELETED, register a tm callback for TMCB_DESTROY to absorb late in-dialog requests (no more "unable to find dialog for <REQUEST TYPE>" log messages). - On callback, unreference and, in consequence, destroy the dialog. (cherry picked from commit 3537c2d8c27617023cb9f9a569435483748fef1f) --- modules_k/dialog/dlg_handlers.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index ad892b6..19b53e9 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -764,6 +764,20 @@ static void unreference_dialog(void *dialog) /*! + * \brief Unreference a dialog from tm callback (another wrapper) + * \param t transaction, unused + * \param type type of the entered callback + * \param param saved dialog structure in the callback + */ +static void unref_dlg_from_cb(struct cell* t, int type, struct tmcb_params *param) +{ + struct dlg_cell *dlg = (struct dlg_cell *)(*param->param); + + unref_dlg(dlg, 1); +} + + +/*! * \brief Function that is registered as RR callback for dialog tracking * * Function that is registered as RR callback for dialog tracking. It @@ -886,6 +900,17 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) set_current_dialog( req, dlg); _dlg_ctx.dlg = dlg; + /* delay deletion of dialog until transaction has died off in order + * to absorb in-air messages */ + if (new_state==DLG_STATE_DELETED && old_state!=DLG_STATE_DELETED) { + if ( d_tmb.register_tmcb(req, NULL, TMCB_DESTROY, + unref_dlg_from_cb, (void*)dlg, NULL)<0 ) { + LM_ERR("failed to register deletion delay function\n"); + } else { + ref_dlg(dlg, 1); + } + } + /* run actions for the transition */ if (event==DLG_EVENT_REQBYE && new_state==DLG_STATE_DELETED && old_state!=DLG_STATE_DELETED) {

1 0

git:master: modules_k/dialog: Delay dialog deletion to absorb late in-dialog
by Timo Reimann 13 Jul '10

13 Jul '10

Module: sip-router Branch: master Commit: 3537c2d8c27617023cb9f9a569435483748fef1f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3537c2d… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Mon Jun 28 10:50:05 2010 +0200 modules_k/dialog: Delay dialog deletion to absorb late in-dialog requests - When a dialog's state transitions to DLG_STATE_DELETED, register a tm callback for TMCB_DESTROY to absorb late in-dialog requests (no more "unable to find dialog for <REQUEST TYPE>" log messages). - On callback, unreference and, in consequence, destroy the dialog. --- modules_k/dialog/dlg_handlers.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index ad892b6..19b53e9 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -764,6 +764,20 @@ static void unreference_dialog(void *dialog) /*! + * \brief Unreference a dialog from tm callback (another wrapper) + * \param t transaction, unused + * \param type type of the entered callback + * \param param saved dialog structure in the callback + */ +static void unref_dlg_from_cb(struct cell* t, int type, struct tmcb_params *param) +{ + struct dlg_cell *dlg = (struct dlg_cell *)(*param->param); + + unref_dlg(dlg, 1); +} + + +/*! * \brief Function that is registered as RR callback for dialog tracking * * Function that is registered as RR callback for dialog tracking. It @@ -886,6 +900,17 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) set_current_dialog( req, dlg); _dlg_ctx.dlg = dlg; + /* delay deletion of dialog until transaction has died off in order + * to absorb in-air messages */ + if (new_state==DLG_STATE_DELETED && old_state!=DLG_STATE_DELETED) { + if ( d_tmb.register_tmcb(req, NULL, TMCB_DESTROY, + unref_dlg_from_cb, (void*)dlg, NULL)<0 ) { + LM_ERR("failed to register deletion delay function\n"); + } else { + ref_dlg(dlg, 1); + } + } + /* run actions for the transition */ if (event==DLG_EVENT_REQBYE && new_state==DLG_STATE_DELETED && old_state!=DLG_STATE_DELETED) {

1 0

[dialog MI dlg_end_dlg] error when terminating a dialog in state 2 (never removed from memory)
by Iñaki Baz Castillo 13 Jul '10

13 Jul '10

Hi, Kamailio 1.5.4, let's suppose this case: 1) A dialog in eary state (state 2): ~# kamctl fifo profile_list_dlgs out dialog:: hash=1055:330534072 state:: 2 2) Now try to terminate it: ~# kamctl fifo dlg_end_dlg 1055 330534072 3) It produces an error because in the early dialog there is no Contact for the called: ERROR:dialog:build_dlg_t: no contact available ERROR:dialog:send_bye: failed to create dlg_t CRITICAL:dialog:log_next_state_dlg: bogus event 7 in state 2 for dlg 0x7f25f0cde718 [3168:435552476] with clid 'hqpprxbyrutiytu@ibc-torre' and tags 'ysldc' '' 4) The dialog remains in state 2 (as the MI command shows), and later it's cancelled by the UAC. 5) MI profile_list_dlgs out will show the dialog in state 5 *forever*, it's never deleted from memory! (perhaps it's after expiration time, haven't checked it). NOTE: I do know that dlg_end_dlg is not ready for early dialogs, as it should trigger a transaction cancel (CANCEL to all the branches and 408 to the UAC) rather than sending a BYE, but this feature is not implemented. However the current code could leak. -- Iñaki Baz Castillo <ibc(a)aliax.net>

3 26

dialog module: failed_dlgs semantics
by Timo Reimann 13 Jul '10

13 Jul '10

Hi, what's the dialog module's "failed_dlgs" counter variable (defined in modules_k/dialog.c) supposed to indicate? My understanding would be that it shows the number of dialogs that could not reach the "confirmed" call state, i.e., calls for which the caller received a non-2xx final response after the initial INVITE during routing. However, the variable is increased in situations for which a dialog could not be set up in the very first place due to either - malformed SIP headers in the INVITE request, - lack of shared memory, and - unsuccessful callback registrations to the rr or tm module which are all checked in dlg_handler.c's dlg_new_dialog() function prior to any further response processing. What I'd prefer to do to the least is additionally update the counter variable every time a non-2xx final response has been received to indicate call failure in the SIP sense. Going one step further, I'd remove the update code from its current place because I do not see much meaning in running statistics on hard errors as given above. The cases are already covered by ERROR-level log messages so they will be reported anyway. To sum up my goal: If no one objects, I will change the code such that hard errors are not covered by failed_dlgs anymore but failure to establish SIP sessions are. Cheers, --Timo

1 1

SF.net SVN: openser:[6019] branches/1.5/modules/dialog/dlg_handlers.c
by timoreimann＠users.sourceforge.net 13 Jul '10

13 Jul '10

Revision: 6019 http://openser.svn.sourceforge.net/openser/?rev=6019&view=rev Author: timoreimann Date: 2010-07-13 16:55:11 +0000 (Tue, 13 Jul 2010) Log Message: ----------- Increase failed_dlgs when a non-2xx final response has been received only. 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.

1 0

git:kamailio_3.0: Increase failed_dlgs when a non-2xx final response has been
by Timo Reimann 13 Jul '10

13 Jul '10

Module: sip-router Branch: kamailio_3.0 Commit: c074bd7c719c4e054c5a537f92467db207e42f9b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c074bd7… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Mon Jul 5 17:52:12 2010 +0200 Increase failed_dlgs when a non-2xx final response has been received only. (cherry picked from commit dd9681ce5f6602c888d847a283eaaf637318994d) --- modules_k/dialog/dlg_handlers.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 5fd3d31..ad892b6 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -397,6 +397,9 @@ static void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) unref_dlg(dlg,unref); if (old_state==DLG_STATE_EARLY) if_update_stat(dlg_enable_stats, early_dlgs, -1); + + if_update_stat(dlg_enable_stats, failed_dlgs, 1); + return; } @@ -645,7 +648,6 @@ int dlg_new_dialog(struct sip_msg *msg, struct cell *t) error: unref_dlg(dlg,1); profile_cleanup(msg, 0, NULL); - update_stat(failed_dlgs, 1); return -1; }

1 0

git:master: Increase failed_dlgs when a non-2xx final response has been
by Timo Reimann 13 Jul '10

13 Jul '10

Module: sip-router Branch: master Commit: dd9681ce5f6602c888d847a283eaaf637318994d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dd9681c… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Mon Jul 5 17:52:12 2010 +0200 Increase failed_dlgs when a non-2xx final response has been received only. --- modules_k/dialog/dlg_handlers.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 5fd3d31..ad892b6 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -397,6 +397,9 @@ static void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) unref_dlg(dlg,unref); if (old_state==DLG_STATE_EARLY) if_update_stat(dlg_enable_stats, early_dlgs, -1); + + if_update_stat(dlg_enable_stats, failed_dlgs, 1); + return; } @@ -645,7 +648,6 @@ int dlg_new_dialog(struct sip_msg *msg, struct cell *t) error: unref_dlg(dlg,1); profile_cleanup(msg, 0, NULL); - update_stat(failed_dlgs, 1); return -1; }

1 0

SF.net SVN: openser:[6018] branches/1.5/modules/dialog/dlg_hash.c
by timoreimann＠users.sourceforge.net 13 Jul '10

13 Jul '10

Revision: 6018 http://openser.svn.sourceforge.net/openser/?rev=6018&view=rev Author: timoreimann Date: 2010-07-13 12:59:25 +0000 (Tue, 13 Jul 2010) Log Message: ----------- Fix minor typo Modified Paths: -------------- branches/1.5/modules/dialog/dlg_hash.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

git:kamailio_3.0: Fix minor typo
by Timo Reimann 13 Jul '10

13 Jul '10

Module: sip-router Branch: kamailio_3.0 Commit: 6e3cef5314573e56de6b7bd8f58691526101a98c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6e3cef5… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Tue Jul 13 14:46:54 2010 +0200 Fix minor typo (cherry picked from commit d4c63b7f3e7be5a2a86c929d013f19d6c8cbb4eb) --- modules_k/dialog/dlg_hash.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index 72b7fec..6df21e3 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -132,7 +132,7 @@ inline void destroy_dlg(struct dlg_cell *dlg) { int ret = 0; - LM_DBG("destroing dialog %p\n",dlg); + LM_DBG("destroying dialog %p\n",dlg); ret = remove_dialog_timer(&dlg->tl); if (ret < 0) {

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2010