sr-dev August 2011

sr-dev@lists.kamailio.org

33 participants
292 discussions

RLS/PUA concurrency issue
by Andrew Miller 12 Aug '11

12 Aug '11

Folks, I've been having a bit of a battle with a concurrency issue. If we have a reasonable number of contacts in an RLS resource list (around 50 does it on my test server), we see a get the following error message thrown up between 2 and 6 times whenever the client logs in. ERROR: rls [resource_notify.c:663]: no presence dialog record for non-TERMINATED state uri pres_uri = sip:0033@lab8.croc.internal watcher_uri = sip:ernie@lab8.croc.internal (I've extended the debug here to include the URIs, so I can see what is not being found) It is not always the same URIs that go missing, nor is it always the same number of faults. On investigation this turns out to be a race condition. subs_cback_func (pua/send_subscribe.c) locks the presentity hash table and inserts a dialog entry when it receives a 200 to the subscribe. rls_handle_notify (rls/resource_notify.c) calls pua_get_record_id (pua/hash.c get_record_id()) which also locks the presentity hash table looks up the dialog. It seems that in some cases the NOTIFY is getting the lock before the 200 to the SUBSCRIBE. Thus the NOTIFY handler is looking for the dialog before the 200 handler has inserted it. I attempted to insert a dialog entry in the hash table on sending the SUBSCRIBE, unfortunately this did not cure the problem Has anyone any suggestions for the cleanest and easiest method to ensure that the 200 is handled before the NOTIFY? Andy Miller Crocodile RCS

5 15

git:master: Expose terminate_dlg through C API
by Jason Penton 12 Aug '11

12 Aug '11

Module: sip-router Branch: master Commit: ce75cc0612ae72cceb2c07298893559aca51fe34 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ce75cc0… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Fri Aug 12 17:36:33 2011 +0200 Expose terminate_dlg through C API --- modules_k/dialog/dlg_load.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/dialog/dlg_load.h b/modules_k/dialog/dlg_load.h index 0e74880..ad6d060 100644 --- a/modules_k/dialog/dlg_load.h +++ b/modules_k/dialog/dlg_load.h @@ -32,18 +32,18 @@ #include "dlg_cb.h" #include "../../sr_module.h" +/* terminate_dlg function prototype */ +typedef int (*terminate_dlg_f)(struct dlg_cell* dlg, str *hdrs); + struct dlg_binds { register_dlgcb_f register_dlgcb; terminate_dlg_f terminate_dlg; }; -/* terminate_dlg function prototype */ -typedef int (*terminate_dlg_f)(struct dlg_cell* dlg, str *hdrs); typedef int(*load_dlg_f)( struct dlg_binds *dlgb ); int load_dlg( struct dlg_binds *dlgb); - static inline int load_dlg_api( struct dlg_binds *dlgb ) { load_dlg_f load_dlg;

1 0

git:master: Expose terminate_dlg through C API
by Jason Penton 12 Aug '11

12 Aug '11

Module: sip-router Branch: master Commit: f43f2f1e08559c66fb3a9e9ad9720ce12eeb3f8e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f43f2f1… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Fri Aug 12 17:34:03 2011 +0200 Expose terminate_dlg through C API --- modules_k/dialog/dialog.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index 79688a8..d17fdb1 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -371,6 +371,7 @@ static int fixup_get_profile3(void** param, int param_no) int load_dlg( struct dlg_binds *dlgb ) { dlgb->register_dlgcb = register_dlgcb; + dlgb->terminate_dlg = dlg_bye_all; return 1; }

1 0

git:master: Expose terminate_dlg through C API
by Jason Penton 12 Aug '11

12 Aug '11

Module: sip-router Branch: master Commit: 01fce62471c4684c894199e78274753a1db5075b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=01fce62… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Fri Aug 12 17:07:17 2011 +0200 Expose terminate_dlg through C API --- modules_k/dialog/dlg_load.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/dlg_load.h b/modules_k/dialog/dlg_load.h index 89df271..0e74880 100644 --- a/modules_k/dialog/dlg_load.h +++ b/modules_k/dialog/dlg_load.h @@ -34,8 +34,11 @@ struct dlg_binds { register_dlgcb_f register_dlgcb; + terminate_dlg_f terminate_dlg; }; +/* terminate_dlg function prototype */ +typedef int (*terminate_dlg_f)(struct dlg_cell* dlg, str *hdrs); typedef int(*load_dlg_f)( struct dlg_binds *dlgb ); int load_dlg( struct dlg_binds *dlgb);

1 0

git:master: Added terminate_dlg description
by Jason Penton 12 Aug '11

12 Aug '11

Module: sip-router Branch: master Commit: 56f48489ae8fc20c6e00821f8159857d2a5cc9f5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=56f4848… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Fri Aug 12 17:28:18 2011 +0200 Added terminate_dlg description --- modules_k/dialog/doc/dialog_devel.xml | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/doc/dialog_devel.xml b/modules_k/dialog/doc/dialog_devel.xml index 322d45b..df20e88 100644 --- a/modules_k/dialog/doc/dialog_devel.xml +++ b/modules_k/dialog/doc/dialog_devel.xml @@ -129,6 +129,29 @@ </itemizedlist> </section> + + <section> + <title> + <function moreinfo="none">terminate_dlg (dlg, hdrs)</function> + </title> + <para> + Terminate a Dialog + </para> + <para>Meaning of parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>struct dlg_cell* dlg</emphasis> - dialog to + terminate. + </para> + </listitem> + <listitem> + <para><emphasis>str* hdrs</emphasis> - string containg extra headers (full format) + to be added to the BYE requests of the dialog. + </para> + </listitem> + </itemizedlist> + </section> + </section> </chapter>

1 0

git:3.1: modules_k/dialog: Fix a bug that would cause a segfault when
by Timo Reimann 12 Aug '11

12 Aug '11

Module: sip-router Branch: 3.1 Commit: 3ca04c644ee40c22b242ae50c7d87d71cc2f63c5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3ca04c6… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Fri Aug 12 14:08:02 2011 +0200 modules_k/dialog: Fix a bug that would cause a segfault when caller bind address information could not be retrieved from database and "dlg_list" was fifo-issued. - Check nulliness of dlg->bind_addr[DLG_CALLER_LEG] before printing. (May be NULL when server doesn't feel responsible for a bound address loaded from dialog database.) - Move check-and-print code for both directions (caller and callee) next to each other. (cherry picked from commit ab21b25652a8a1b44c1ec1ece01767d24e0ba33b) --- modules_k/dialog/dlg_hash.c | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 deletions(-) diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index 95e541c..ef2791e 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -870,11 +870,25 @@ static inline int internal_mi_print_dlg(struct mi_node *rpl, if(node1 == 0) goto error; - node1 = add_mi_node_child(node, 0,"caller_bind_addr",16, - dlg->bind_addr[DLG_CALLER_LEG]->sock_str.s, + if (dlg->bind_addr[DLG_CALLER_LEG]) { + node1 = add_mi_node_child(node, 0, + "caller_bind_addr",16, + dlg->bind_addr[DLG_CALLER_LEG]->sock_str.s, dlg->bind_addr[DLG_CALLER_LEG]->sock_str.len); - if(node1 == 0) - goto error; + } else { + node1 = add_mi_node_child(node, 0, + "caller_bind_addr",16,0,0); + } + + if (dlg->bind_addr[DLG_CALLEE_LEG]) { + node1 = add_mi_node_child(node, 0, + "callee_bind_addr",16, + dlg->bind_addr[DLG_CALLEE_LEG]->sock_str.s, + dlg->bind_addr[DLG_CALLEE_LEG]->sock_str.len); + } else { + node1 = add_mi_node_child(node, 0, + "callee_bind_addr",16,0,0); + } node1 = add_mi_node_child(node, MI_DUP_VALUE, "to_uri", 6, dlg->to_uri.s, dlg->to_uri.len); @@ -904,15 +918,6 @@ static inline int internal_mi_print_dlg(struct mi_node *rpl, if(node1 == 0) goto error; - if (dlg->bind_addr[DLG_CALLEE_LEG]) { - node1 = add_mi_node_child(node, 0, - "callee_bind_addr",16, - dlg->bind_addr[DLG_CALLEE_LEG]->sock_str.s, - dlg->bind_addr[DLG_CALLEE_LEG]->sock_str.len); - } else { - node1 = add_mi_node_child(node, 0, - "callee_bind_addr",16,0,0); - } if(node1 == 0) goto error;

1 0

git:3.1: modules_k/dialog: Improve dialog timer list handling.
by Timo Reimann 12 Aug '11

12 Aug '11

Module: sip-router Branch: 3.1 Commit: 4fa1e1b5e4dbd9939b8dca2b2440bfde1dab72f0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4fa1e1b… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Aug 11 17:19:20 2011 +0200 modules_k/dialog: Improve dialog timer list handling. - Avoid updating a dialog timer item if it is not yet linked into the timer list. (Avoids reference counting bugs due to race conditions where the timer list has not been initialized yet prior to any update attempts.) - In case of bogus dialog during timer insertion, postpone release of dialog timer lock until error log message has been emitted. (cherry picked from commit 7afb2cf8e4640bbaadfc80fcc052b34d5ae3cfae) --- modules_k/dialog/dlg_timer.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/modules_k/dialog/dlg_timer.c b/modules_k/dialog/dlg_timer.c index 03cc5b3..7308eee 100644 --- a/modules_k/dialog/dlg_timer.c +++ b/modules_k/dialog/dlg_timer.c @@ -133,9 +133,9 @@ int insert_dlg_timer(struct dlg_tl *tl, int interval) lock_get( d_timer->lock); if (tl->next!=0 || tl->prev!=0) { - lock_release( d_timer->lock); LM_CRIT("Trying to insert a bogus dlg tl=%p tl->next=%p tl->prev=%p\n", tl, tl->next, tl->prev); + lock_release( d_timer->lock); return -1; } tl->timeout = get_ticks()+interval; @@ -202,14 +202,13 @@ int update_dlg_timer(struct dlg_tl *tl, int timeout) { lock_get( d_timer->lock); - if ( tl->next ) { - if (tl->prev==0) { - lock_release( d_timer->lock); - return -1; - } - remove_dialog_timer_unsafe(tl); + if (tl->next==0 || tl->prev==0) { + LM_CRIT("Trying to update a bogus dlg tl=%p tl->next=%p tl->prev=%p\n", + tl, tl->next, tl->prev); + lock_release( d_timer->lock); + return -1; } - + remove_dialog_timer_unsafe( tl ); tl->timeout = get_ticks()+timeout; insert_dialog_timer_unsafe( tl );

1 0

git:master: modules_k/dialog: Fix a bug that would cause a segfault when
by Timo Reimann 12 Aug '11

12 Aug '11

Module: sip-router Branch: master Commit: ab21b25652a8a1b44c1ec1ece01767d24e0ba33b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ab21b25… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Fri Aug 12 14:08:02 2011 +0200 modules_k/dialog: Fix a bug that would cause a segfault when caller bind address information could not be retrieved from database and "dlg_list" was fifo-issued. - Check nulliness of dlg->bind_addr[DLG_CALLER_LEG] before printing. (May be NULL when server doesn't feel responsible for a bound address loaded from dialog database.) - Move check-and-print code for both directions (caller and callee) next to each other. --- modules_k/dialog/dlg_hash.c | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 deletions(-) diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index 4bf402c..412440a 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -884,11 +884,25 @@ static inline int internal_mi_print_dlg(struct mi_node *rpl, if(node1 == 0) goto error; - node1 = add_mi_node_child(node, 0,"caller_bind_addr",16, - dlg->bind_addr[DLG_CALLER_LEG]->sock_str.s, + if (dlg->bind_addr[DLG_CALLER_LEG]) { + node1 = add_mi_node_child(node, 0, + "caller_bind_addr",16, + dlg->bind_addr[DLG_CALLER_LEG]->sock_str.s, dlg->bind_addr[DLG_CALLER_LEG]->sock_str.len); - if(node1 == 0) - goto error; + } else { + node1 = add_mi_node_child(node, 0, + "caller_bind_addr",16,0,0); + } + + if (dlg->bind_addr[DLG_CALLEE_LEG]) { + node1 = add_mi_node_child(node, 0, + "callee_bind_addr",16, + dlg->bind_addr[DLG_CALLEE_LEG]->sock_str.s, + dlg->bind_addr[DLG_CALLEE_LEG]->sock_str.len); + } else { + node1 = add_mi_node_child(node, 0, + "callee_bind_addr",16,0,0); + } node1 = add_mi_node_child(node, MI_DUP_VALUE, "to_uri", 6, dlg->to_uri.s, dlg->to_uri.len); @@ -918,15 +932,6 @@ static inline int internal_mi_print_dlg(struct mi_node *rpl, if(node1 == 0) goto error; - if (dlg->bind_addr[DLG_CALLEE_LEG]) { - node1 = add_mi_node_child(node, 0, - "callee_bind_addr",16, - dlg->bind_addr[DLG_CALLEE_LEG]->sock_str.s, - dlg->bind_addr[DLG_CALLEE_LEG]->sock_str.len); - } else { - node1 = add_mi_node_child(node, 0, - "callee_bind_addr",16,0,0); - } if(node1 == 0) goto error;

1 0

git:master: modules_k/dialog: Improve dialog timer list handling.
by Timo Reimann 12 Aug '11

12 Aug '11

Module: sip-router Branch: master Commit: 7afb2cf8e4640bbaadfc80fcc052b34d5ae3cfae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7afb2cf… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Aug 11 17:19:20 2011 +0200 modules_k/dialog: Improve dialog timer list handling. - Avoid updating a dialog timer item if it is not yet linked into the timer list. (Avoids reference counting bugs due to race conditions where the timer list has not been initialized yet prior to any update attempts.) - In case of bogus dialog during timer insertion, postpone release of dialog timer lock until error log message has been emitted. --- modules_k/dialog/dlg_timer.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/modules_k/dialog/dlg_timer.c b/modules_k/dialog/dlg_timer.c index 03cc5b3..7308eee 100644 --- a/modules_k/dialog/dlg_timer.c +++ b/modules_k/dialog/dlg_timer.c @@ -133,9 +133,9 @@ int insert_dlg_timer(struct dlg_tl *tl, int interval) lock_get( d_timer->lock); if (tl->next!=0 || tl->prev!=0) { - lock_release( d_timer->lock); LM_CRIT("Trying to insert a bogus dlg tl=%p tl->next=%p tl->prev=%p\n", tl, tl->next, tl->prev); + lock_release( d_timer->lock); return -1; } tl->timeout = get_ticks()+interval; @@ -202,14 +202,13 @@ int update_dlg_timer(struct dlg_tl *tl, int timeout) { lock_get( d_timer->lock); - if ( tl->next ) { - if (tl->prev==0) { - lock_release( d_timer->lock); - return -1; - } - remove_dialog_timer_unsafe(tl); + if (tl->next==0 || tl->prev==0) { + LM_CRIT("Trying to update a bogus dlg tl=%p tl->next=%p tl->prev=%p\n", + tl, tl->next, tl->prev); + lock_release( d_timer->lock); + return -1; } - + remove_dialog_timer_unsafe( tl ); tl->timeout = get_ticks()+timeout; insert_dialog_timer_unsafe( tl );

1 0

git:pd/pua_fix: modules/tm, modules_k/pua: Fix for concurrency issue in PUA module
by Peter Dunkley 11 Aug '11

11 Aug '11

Module: sip-router Branch: pd/pua_fix Commit: b93149c756d3e983c70608938f1142ed43ee1834 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b93149c… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Thu Aug 11 17:28:19 2011 +0100 modules/tm, modules_k/pua: Fix for concurrency issue in PUA module - It is quite possible for the mandatory NOTIFY request sent by a presence server on establishment of a SUBSCRIBE dialog to over-take (either on the wire or within Kamailio) the 2xx response to the SUBSCRIBE. When this happens Kamailio outputs an error message and does not update the rls_presentity table. - The change to the tm module is to make t_request_outside take the same arguments (and exhibit mostly the same behaviour) as t_request. This is safe to do as a search of the code-base has shown that t_request_outside was not actually used anywhere. The difference between t_request and t_request_outside is that t_request frees the dialog structure it creates, whereas t_request_outside leaves the dialog structure so that the caller can use it to find things like the Call-ID and local tag generated for the request. The hash table implementation in pua has been modified to enable temporary dialogs to be found (new function get_temporary_dialog()). A temporary dialog contains the minimal information that was available when the SUBSCRIBE request was sent. Temporary dialogs are replaced with proper ones when a 2xx response is received. The delete_htable() function has been updated so that it can delete both full and temporary dialogs. pua.c has been modified to fix a bug in db_update() - n_query_cols was being incorrectly decremented in a certain case within a double loop. db_update() has also been changed to cope with needing to insert temporary (and therefore not fully filled in) dialogs into the database. send_subscribe.c has been modified to create temporary dialogs whenever an initial SUBSCRIBE is sent. The SUBSCRIBE callback function searches for and removes any temporary dialogs relating to the transaction before it returns. In normal (non error handling behaviour) temporary dialogs are not removed until after a full dialog has been created and added to the hash table. --- modules/tm/uac.c | 11 +++++- modules/tm/uac.h | 4 +- modules_k/pua/hash.c | 75 +++++++++++++++++++++++++++++++--------- modules_k/pua/hash.h | 1 + modules_k/pua/pua.c | 62 +++++++++++++++++++++++++-------- modules_k/pua/send_subscribe.c | 75 ++++++++++++++++++++++++++++++++++++++- 6 files changed, 191 insertions(+), 37 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=b93…

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
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