modules_k/dialog: Prevent "unable to find dialog" WARN messages
authorTimo Reimann <timo.reimann@1und1.de>
Tue, 27 Jul 2010 12:37:06 +0000 (14:37 +0200)
committerTimo Reimann <timo.reimann@1und1.de>
Tue, 27 Jul 2010 13:44:01 +0000 (15:44 +0200)
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.

modules_k/dialog/dlg_cb.c
modules_k/dialog/dlg_handlers.c
modules_k/dialog/dlg_hash.c
modules_k/dialog/dlg_hash.h

index 24b3b39..464083e 100644 (file)
@@ -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);
 
index 976ac0f..a3610cc 100644 (file)
@@ -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,
index 6df21e3..b3d626b 100644 (file)
@@ -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;
 }
index 889a318..6aa6db5 100644 (file)
@@ -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