Changeset 5099

Timestamp:

May 20, 2015 8:46:11 AM (9 years ago)

Author:

nanang

Message:

Fixed #1854:

• Hangup the call immediately when there is no active media, this is only for initial INVITE.
• Stop media and destroy media transport properly upon any error.

Location:

pjproject/trunk/pjsip/src/pjsua-lib

Files:

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

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

@@ -3890 +3890 @@
     /* Update media channel with the new SDP */
     status = pjsua_media_channel_update(call->index, local_sdp, remote_sdp);
+
+    /* If this is not the initial INVITE, don't disconnect call due to
+     * no media after SDP negotiation.
+     */
+    if (status == PJMEDIA_SDPNEG_ENOMEDIA &&
+        call->inv->state == PJSIP_INV_STATE_CONFIRMED)
+    {
+        status = PJ_SUCCESS;
+    }
+
+    /* Disconnect call after failure in media channel update */
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Unable to create media session",

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

@@ -2650 +2650 @@
                                  "for call_id %d media %d",
                              call_id, mi));
-                continue;
+                goto on_check_med_status;
             }
 
@@ -2708 +2708 @@
                                      "for call_id %d media %d",
                                      call_id, mi));
-                        continue;
+                        goto on_check_med_status;
                     }
                     status = pjmedia_transport_media_create(call_med->tp,
@@ -2718 +2718 @@
                                      "for call_id %d media %d",
                                      call_id, mi));
-                        continue;
+                        goto on_check_med_status;
                     }
                 }
@@ -2731 +2731 @@
                                      "for call_id %d media %d",
                                  call_id, mi));
-                    continue;
+                    goto on_check_med_status;
                 }
 
@@ -2756 +2756 @@
                                          "for call_id %d media %d",
                                      call_id, mi));
-                        continue;
+                        goto on_check_med_status;
                     }
                 }
@@ -2826 +2826 @@
                                  "for call_id %d media %d",
                              call_id, mi));
-                continue;
+                goto on_check_med_status;
             }
 
@@ -2861 +2861 @@
                                      "for call_id %d media %d",
                                  call_id, mi));
-                    continue;
+                    goto on_check_med_status;
                 }
 
@@ -2886 +2886 @@
                                          "for call_id %d media %d",
                                      call_id, mi));
-                        continue;
+                        goto on_check_med_status;
                     }
                 }
@@ -2951 +2951 @@
         }
 
+on_check_med_status:
         if (status != PJ_SUCCESS) {
+            /* Stop stream */
+            stop_media_stream(call, mi);
+
+            /* Close the media transport */
+            if (call_med->tp) {
+                pjsua_set_media_tp_state(call_med, PJSUA_MED_TP_NULL);
+                pjmedia_transport_close(call_med->tp);
+                call_med->tp = call_med->tp_orig = NULL;
+            }
+
+            /* Update media states */
+            call_med->state = PJSUA_CALL_MEDIA_ERROR;
+            call_med->dir = PJMEDIA_DIR_NONE;
+
             PJ_PERROR(1,(THIS_FILE, status, "Error updating media call%02d:%d",
                          call_id, mi));
         } else {
-            got_media = PJ_TRUE;
+            /* Only set 'got_media' flag if this media is not disabled */
+            if (local_sdp->media[mi]->desc.port != 0)
+                got_media = PJ_TRUE;
         }
     }