Changeset 4363

Timestamp:

Feb 21, 2013 4:43:24 PM (12 years ago)

Author:

bennylp

Message:

Re #1623: fixed deadlock between conference mutex and ICE. Scenario:

• sound device thread calls put_frame() which gets the conf mutex, and is calling transport sendto() to send RTP packet which requires ICE mutex.
• The worker thread finished ICE negotiation and notifies PJSUA-LIB and application while holding ICE group lock, app then do conf_connect() which causes deadlock.

This fix defer the callback to a timer.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c (modified) (5 diffs)

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

@@ -553 +553 @@
 #endif
 
-static void med_tp_timer_cb(void *user_data)
+/* Deferred callback to notify ICE init complete */
+static void ice_init_complete_cb(void *user_data)
 {
     pjsua_call_media *call_med = (pjsua_call_media*)user_data;
@@ -571 +572 @@
         pjsip_dialog *dlg = NULL;
 
-        if (acquire_call("med_tp_timer_cb", call_med->call->index,
+        if (acquire_call("ice_init_complete_cb", call_med->call->index,
                          &call, &dlg) != PJ_SUCCESS)
         {
@@ -586 +587 @@
 }
 
+/* Deferred callback to notify ICE negotiation failure */
+static void ice_failed_nego_cb(void *user_data)
+{
+    int call_id = (int)(long)user_data;
+    pjsua_call *call = NULL;
+    pjsip_dialog *dlg = NULL;
+
+    if (acquire_call("ice_failed_nego_cb", call_id,
+                     &call, &dlg) != PJ_SUCCESS)
+    {
+        /* Call have been terminated */
+        return;
+    }
+
+    pjsua_var.ua_cfg.cb.on_call_media_state(call_id);
+
+    if (dlg)
+        pjsip_dlg_dec_lock(dlg);
+
+}
 
 /* This callback is called when ICE negotiation completes */
@@ -603 +624 @@
     case PJ_ICE_STRANS_OP_INIT:
         call_med->tp_result = result;
-        pjsua_schedule_timer2(&med_tp_timer_cb, call_med, 1);
+        pjsua_schedule_timer2(&ice_init_complete_cb, call_med, 1);
         break;
     case PJ_ICE_STRANS_OP_NEGOTIATION:
@@ -616 +637 @@
             call_med->dir = PJMEDIA_DIR_NONE;
             if (call && pjsua_var.ua_cfg.cb.on_call_media_state) {
-                pjsua_var.ua_cfg.cb.on_call_media_state(call->index);
+                /* Defer the callback to a timer */
+                pjsua_schedule_timer2(&ice_failed_nego_cb,
+                                      (void*)(long)call->index, 1);
             }
         }