Changeset 4986 for pjproject

Timestamp:

Mar 2, 2015 9:43:20 AM (10 years ago)

Author:

ming

Message:

Fixed #1817: Automatically send BYE when sending CANCEL for INVITE is unsuccessful.

Location:

pjproject/trunk/pjsip

Files:

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

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

@@ -145 +145 @@
     pj_bool_t            med_update_success;
                                     /**< Is media update successful?        */
+    pj_bool_t            hanging_up;/**< Is call in the process of hangup?  */
 
     int                  audio_idx; /**< First active audio media.          */

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

@@ -2280 +2280 @@
         goto on_return;
 
+    call->hanging_up = PJ_TRUE;
+
     /* If media transport creation is not yet completed, we will hangup
      * the call in the media transport creation callback instead.
@@ -2313 +2315 @@
                      "Failed to create end session message",
                      status);
+        call->hanging_up = PJ_FALSE;
         goto on_return;
     }
@@ -2332 +2335 @@
                      "Failed to send end session message",
                      status);
+        call->hanging_up = PJ_FALSE;
         goto on_return;
     }
@@ -3813 +3817 @@
     call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id];
 
+    if (call->hanging_up)
+        goto on_return;
+
     if (status != PJ_SUCCESS) {
 
@@ -4735 +4742 @@
                 tsx->status_code!=422))
     {
-        if (tsx->status_code/100 != 2) {
+        if (tsx->status_code/100 == 2) {
+            /* If we have sent CANCEL and the original INVITE returns a 2xx,
+             * we then send BYE.
+             */
+            if (call->hanging_up) {
+                PJ_LOG(3,(THIS_FILE, "Unsuccessful in cancelling the original "
+                          "INVITE for call %d due to %d response, sending BYE "
+                          "instead", call->index, tsx->status_code));
+                call_disconnect(call->inv, PJSIP_SC_OK);
+            }
+        } else {
             /* Monitor the status of call hold/unhold request */
             if (tsx->last_tx == (pjsip_tx_data*)call->hold_msg) {