Changeset 197 for pjproject/trunk/pjsip/src/pjsip/sip_ua_layer.c

Timestamp:

Feb 19, 2006 1:38:06 AM (18 years ago)

Author:

bennylp

Message:

Initial SIMPLE implementation

File:

• pjproject/trunk/pjsip/src/pjsip/sip_ua_layer.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsip/sip_ua_layer.c

@@ -522 +522 @@
     }
 
-    /* Dialog MUST be found! */
+    /* Dialog may not be found, e.g. in this case:
+     *  - UAC sends SUBSCRIBE, then UAS sends NOTIFY before answering
+     *    SUBSCRIBE request with 2xx.
+     *
+     * In this case, we can accept the request ONLY when the original 
+     * dialog still has empty To tag.
+     */
     if (dlg == (pjsip_dialog*)&dlg_set->dlg_list) {
 
-        /* Not found. Mulfunction UAC? */
-        pj_mutex_unlock(mod_ua.mutex);
-
-        PJ_LOG(5,(THIS_FILE, 
-                  "Unable to find dialog for %s, answering with 481",
-                  pjsip_rx_data_get_info(rdata)));
-
-        pjsip_endpt_respond_stateless(mod_ua.endpt, rdata,
-                                      PJSIP_SC_CALL_TSX_DOES_NOT_EXIST, 
-                                      NULL, NULL, NULL);
-        return PJ_TRUE;
+        pjsip_dialog *first_dlg = dlg_set->dlg_list.next;
+
+        if (first_dlg->remote.info->tag.slen != 0) {
+            /* Not found. Mulfunction UAC? */
+            pj_mutex_unlock(mod_ua.mutex);
+
+            PJ_LOG(5,(THIS_FILE, 
+                      "Unable to find dialog for %s, answering with 481",
+                      pjsip_rx_data_get_info(rdata)));
+
+            pjsip_endpt_respond_stateless(mod_ua.endpt, rdata,
+                                          PJSIP_SC_CALL_TSX_DOES_NOT_EXIST, 
+                                          NULL, NULL, NULL);
+            return PJ_TRUE;
+        }
+
+        dlg = first_dlg;
     }