Changeset 4948 for pjproject

Timestamp:

Oct 17, 2014 12:47:31 AM (10 years ago)

Author:

ming

Message:

Fixed #1797: Clean up provisional media after re-invite/update

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua_internal.h (modified) (1 diff)
• src/pjsua-lib/pjsua_call.c (modified) (5 diffs)
• src/pjsua-lib/pjsua_media.c (modified) (2 diffs)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -143 +143 @@
     pjsua_call_media     media_prov[PJSUA_MAX_CALL_MEDIA];
                                     /**< Array of provisional media.        */
+    pj_bool_t            med_update_success;
+                                    /**< Is media update successful?        */
 
     int                  audio_idx; /**< First active audio media.          */

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

@@ -49 +49 @@
 };
 
+/* UPDATE method */
+static const pjsip_method pjsip_update_method =
+{
+    PJSIP_OTHER_METHOD,
+    { "UPDATE", 6 }
+};
 
 /* This callback receives notification from invite session when the
@@ -2509 +2515 @@
 
     /* Send the request */
+    call->med_update_success = PJ_FALSE;
     status = pjsip_inv_send_msg( call->inv, tdata);
     if (status != PJ_SUCCESS) {
@@ -2617 +2624 @@
 
     /* Send the request */
+    call->med_update_success = PJ_FALSE;
     status = pjsip_inv_send_msg( call->inv, tdata);
     if (status != PJ_SUCCESS) {
@@ -3815 +3823 @@
     }
 
+    call->med_update_success = (status == PJ_SUCCESS);
+
     /* Update remote's NAT type */
     if (pjsua_var.ua_cfg.nat_type_in_sdp) {
@@ -4682 +4692 @@
         }
     } else if (tsx->role == PJSIP_ROLE_UAC &&
-               tsx->last_tx == (pjsip_tx_data*)call->hold_msg &&
-               tsx->state >= PJSIP_TSX_STATE_COMPLETED)
+               pjsip_method_cmp(&tsx->method, &pjsip_invite_method)==0 &&
+               tsx->state >= PJSIP_TSX_STATE_COMPLETED &&
+               (tsx->status_code!=401 && tsx->status_code!=407))
     {
-        /* Monitor the status of call hold request */
-        call->hold_msg = NULL;
-        if (tsx->status_code/100 != 2) {
-            /* Outgoing call hold failed */
-            call->local_hold = PJ_FALSE;
-            PJ_LOG(3,(THIS_FILE, "Error putting call %d on hold (reason=%d)",
-                      call->index, tsx->status_code));
-        }
+        if (tsx->status_code/100 != 2) {
+            /* Monitor the status of call hold/unhold request */
+            if (tsx->last_tx == (pjsip_tx_data*)call->hold_msg) {
+                /* Outgoing call hold failed */
+                call->local_hold = PJ_FALSE;
+                PJ_LOG(3,(THIS_FILE, "Error putting call %d on hold "
+                          "(reason=%d)", call->index, tsx->status_code));
+            } else if (call->opt.flag & PJSUA_CALL_UNHOLD) {
+                /* Call unhold failed */
+                call->local_hold = PJ_TRUE;
+                PJ_LOG(3,(THIS_FILE, "Error releasing hold on call %d "
+                          "(reason=%d)", call->index, tsx->status_code));
+            }   
+        }
+        
+        if (tsx->last_tx == (pjsip_tx_data*)call->hold_msg) {
+            call->hold_msg = NULL;
+        }
+        
+        if (tsx->status_code/100 != 2 ||
+            ((call->opt.flag & PJSUA_CALL_NO_SDP_OFFER) == 0 &&
+             !call->med_update_success))
+        {
+            /* Either we get non-2xx or media update failed,
+             * clean up provisional media.
+             */
+            pjsua_media_prov_clean_up(call->index);
+        }
     } else if (tsx->role == PJSIP_ROLE_UAC &&
-               (call->opt.flag & PJSUA_CALL_UNHOLD) &&
-               tsx->state >= PJSIP_TSX_STATE_COMPLETED)
+               pjsip_method_cmp(&tsx->method, &pjsip_update_method)==0 &&
+               tsx->state >= PJSIP_TSX_STATE_COMPLETED &&
+               (tsx->status_code!=401 && tsx->status_code!=407))
     {
-        /* Monitor the status of call unhold request */
-        if (tsx->status_code/100 != 2 &&
-            (tsx->status_code!=401 && tsx->status_code!=407))
+        if (tsx->status_code/100 != 2 ||
+            ((call->opt.flag & PJSUA_CALL_NO_SDP_OFFER) == 0 &&
+             !call->med_update_success))
         {
-            /* Call unhold failed */
-            call->local_hold = PJ_TRUE;
-            PJ_LOG(3,(THIS_FILE, "Error releasing hold on call %d (reason=%d)",
-                      call->index, tsx->status_code));
+            /* Either we get non-2xx or media update failed,
+             * clean up provisional media.
+             */
+            pjsua_media_prov_clean_up(call->index);
         }
     } else if (tsx->role==PJSIP_ROLE_UAS &&

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

@@ -1530 +1530 @@
     unsigned i;
 
+    if (call->med_prov_cnt > call->med_cnt) {
+        PJ_LOG(4,(THIS_FILE, "Call %d: cleaning up provisional media, "
+                             "prov_med_cnt=%d, med_cnt=%d",
+                             call_id, call->med_prov_cnt, call->med_cnt));
+    }
+
     for (i = idx; i < call->med_prov_cnt; ++i) {
         pjsua_call_media *call_med = &call->media_prov[i];
@@ -1555 +1561 @@
         }
     }
+    
+    call->med_prov_cnt = 0;
 }