Changeset 4749 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

Timestamp:

Feb 18, 2014 12:34:25 PM (11 years ago)

Author:

bennylp

Message:

Fixed #1737: Deadlock between ioqueue key mutex and SIP dialog when adding video media with ICE and STUN enabled

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -830 +830 @@
     if (!async) {
         pj_bool_t has_pjsua_lock = PJSUA_LOCK_IS_LOCKED();
+        pjsip_dialog *dlg = call_med->call->inv ?
+                                call_med->call->inv->dlg : NULL;
         if (has_pjsua_lock)
             PJSUA_UNLOCK();
+        if (dlg) {
+            /* Don't lock otherwise deadlock:
+             * https://trac.pjsip.org/repos/ticket/1737
+             */
+            ++dlg->sess_count;
+            pjsip_dlg_dec_lock(dlg);
+        }
         while (call_med->tp_ready == PJ_EPENDING) {
             pjsua_handle_events(100);
+        }
+        if (dlg) {
+            pjsip_dlg_inc_lock(dlg);
+            --dlg->sess_count;
         }
         if (has_pjsua_lock)