Changeset 3775

Timestamp:

Sep 28, 2011 4:20:30 AM (13 years ago)

Author:

ming

Message:

Re #1266: Fixed failed automated tests for ICE

Location:

pjproject/trunk

Files:

• pjnath/src/pjnath/ice_strans.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

pjproject/trunk/pjnath/src/pjnath/ice_strans.c

@@ -586 +586 @@
     pj_lock_release(ice_st->init_lock);
 
+    PJ_LOG(4,(ice_st->obj_name, "ICE stream transport created"));
+
+    *p_ice_st = ice_st;
+
     /* Check if all candidates are ready (this may call callback) */
     sess_init_update(ice_st);
 
-    PJ_LOG(4,(ice_st->obj_name, "ICE stream transport created"));
-
-    *p_ice_st = ice_st;
     pj_log_pop_indent();
 

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

@@ -613 +613 @@
     
     call->async_call.call_var.out_call.options = options;
-    call->async_call.call_var.out_call.msg_data = pjsua_msg_data_clone(
-                                                      dlg->pool, msg_data);
+    if (msg_data) {
+        call->async_call.call_var.out_call.msg_data = pjsua_msg_data_clone(
+                                                          dlg->pool, msg_data);
+    }
     call->async_call.dlg = dlg;
 

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

@@ -1415 +1415 @@
         if (pjsua_var.media_cfg.enable_ice) {
             status = create_ice_media_transport(tcfg, call_med, async);
+            if (async && status == PJ_SUCCESS) {
+                /* Callback has been called. */
+                call_med->med_init_cb = NULL;
+                /* We cannot return PJ_SUCCESS here since we already call
+                 * the callback.
+                 */
+                return PJ_EPENDING;
+            } else if (async && status == PJ_EPENDING) {
+                /* We will resume call media initialization in the
+                 * on_ice_complete() callback.
+                 */
+                return PJ_EPENDING;
+            }
         } else {
             status = create_udp_media_transport(tcfg, call_med);
         }
 
-        if (status == PJ_EPENDING) {
-            /* We will resume call media initialization in the
-             * on_ice_complete() callback.
-             */
-            return PJ_EPENDING;
-        } else if (status != PJ_SUCCESS) {
+        if (status != PJ_SUCCESS) {
             PJ_PERROR(1,(THIS_FILE, status, "Error creating media transport"));
             return status;