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

Timestamp:

Aug 11, 2006 12:42:50 PM (18 years ago)

Author:

bennylp

Message:

Fixed bugs in previous deadlock workaround

File:

• pjproject/trunk/pjsip/src/pjsip/sip_ua_layer.c (modified) (2 diffs)

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

@@ -587 +587 @@
 
     /* Lock the dialog */
+    PJ_LOG(6,(dlg->obj_name, "UA layer acquiring dialog lock for request"));
     pjsip_dlg_inc_lock(dlg);
+
+    /* Pass to dialog. */
+    pjsip_dlg_on_rx_request(dlg, rdata);
+
+    /* Unlock the dialog. This may destroy the dialog */
+    pjsip_dlg_dec_lock(dlg);
 
     /* Done processing in the UA */
     pj_mutex_unlock(mod_ua.mutex);
-
-    /* Pass to dialog. */
-    pjsip_dlg_on_rx_request(dlg, rdata);
-
-    /* Unlock the dialog. This may destroy the dialog */
-    pjsip_dlg_dec_lock(dlg);
 
     /* Report as handled. */
@@ -783 +784 @@
 
     /* Acquire lock to the dialog. */
+    PJ_LOG(6,(dlg->obj_name, "UA layer acquiring dialog lock for response"));
     pjsip_dlg_inc_lock(dlg);
+
+    /* Pass the response to the dialog. */
+    pjsip_dlg_on_rx_response(dlg, rdata);
+
+    /* Unlock the dialog. This may destroy the dialog. */
+    pjsip_dlg_dec_lock(dlg);
 
     /* Unlock dialog hash table. */
     pj_mutex_unlock(mod_ua.mutex);
-
-    /* Pass the response to the dialog. */
-    pjsip_dlg_on_rx_response(dlg, rdata);
-
-    /* Unlock the dialog. This may destroy the dialog. */
-    pjsip_dlg_dec_lock(dlg);
 
     /* Done. */