Changeset 1133 for pjproject

Timestamp:

Apr 2, 2007 7:27:54 PM (18 years ago)

Author:

bennylp

Message:

Fixed hold/re-INVITE bug when ICE is used

Location:

pjproject/trunk/pjsip/src/pjsua-lib

Files:

• pjsua_call.c (modified) (2 diffs)
• pjsua_media.c (modified) (1 diff)

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

@@ -1215 +1215 @@
     if (call->inv->state != PJSIP_INV_STATE_CONFIRMED) {
         PJ_LOG(3,(THIS_FILE, "Can not re-INVITE call that is not confirmed"));
+        pjsip_dlg_dec_lock(dlg);
+        return PJSIP_ESESSIONSTATE;
+    }
+
+    /* Init media channel */
+    status = pjsua_media_channel_init(call->index, PJSIP_ROLE_UAC);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Error initializing media channel", status);
         pjsip_dlg_dec_lock(dlg);
         return PJSIP_ESESSIONSTATE;
@@ -2246 +2254 @@
         status = create_inactive_sdp( call, &answer );
     } else {
+
         PJ_LOG(4,(THIS_FILE, "Call %d: received updated media offer",
                   call->index));
+
+        /* Init media channel */
+        status = pjsua_media_channel_init(call->index, PJSIP_ROLE_UAC);
+        if (status != PJ_SUCCESS) {
+            pjsua_perror(THIS_FILE, "Error initializing media channel", status);
+            PJSUA_UNLOCK();
+            return;
+        }
+
         status = pjsua_media_channel_create_sdp(call->index, call->inv->pool, &answer);
     }

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

@@ -815 +815 @@
         call->media_dir = PJMEDIA_DIR_NONE;
 
-        /* Shutdown transport */
+        /* Shutdown ICE session */
+        if (pjsua_var.media_cfg.enable_ice) {
+            pjmedia_ice_stop_ice(call->med_tp);
+        }
+
         /* No need because we need keepalive? */