Changeset 3780 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

Oct 3, 2011 8:22:48 AM (13 years ago)

Author:

ming

Message:

Re #1266: Modified pjsua_media_channel_deinit() to resume deinit in the callback (instead of returning PJ_EBUSY) and make sure the right transport is used before calling dlg_respond()

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c (modified) (4 diffs)

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

@@ -358 +358 @@
     }
 
+    /* pjsua_media_channel_deinit() has been called. */
+    if (call->async_call.med_ch_deinit)
+        goto on_error;
+
     /* Create offer */
     status = pjsua_media_channel_create_sdp(call->index, dlg->pool, NULL,
@@ -709 +713 @@
         goto on_return;
     }
-    
+
+    /* pjsua_media_channel_deinit() has been called. */
+    if (call->async_call.med_ch_deinit) {
+        pjsua_media_channel_deinit(call->index);
+        call->med_ch_cb = NULL;
+        PJSUA_UNLOCK();
+        return PJ_SUCCESS;
+    }
+
     /* Get remote SDP offer (if any). */
     if (call->inv->neg)
@@ -1056 +1068 @@
         pjsua_media_channel_deinit(call->index);
         goto on_return;
+    }
+
+    /* If account is locked to specific transport, then lock dialog
+     * to this transport too.
+     */
+    if (pjsua_var.acc[acc_id].cfg.transport_id != PJSUA_INVALID_ID) {
+        pjsip_tpselector tp_sel;
+
+        pjsua_init_tpselector(pjsua_var.acc[acc_id].cfg.transport_id, &tp_sel);
+        pjsip_dlg_set_transport(dlg, &tp_sel);
     }
 
@@ -1127 +1149 @@
         if (pjmedia_sdp_neg_get_neg_remote(inv->neg, &remote_sdp)==PJ_SUCCESS)
             update_remote_nat_type(call, remote_sdp);
-    }
-
-    /* If account is locked to specific transport, then lock dialog
-     * to this transport too.
-     */
-    if (pjsua_var.acc[acc_id].cfg.transport_id != PJSUA_INVALID_ID) {
-        pjsip_tpselector tp_sel;
-
-        pjsua_init_tpselector(pjsua_var.acc[acc_id].cfg.transport_id, &tp_sel);
-        pjsip_dlg_set_transport(dlg, &tp_sel);
     }