Changeset 3749 for pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

Sep 15, 2011 10:09:44 AM (13 years ago)

Author:

bennylp

Message:

Fixed #1369: Local state is set to HOLD even if hold operation fails

File:

• pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_call.c (modified) (2 diffs)

pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_call.c

@@ -1654 +1654 @@
     pjsua_process_msg_data( tdata, msg_data);
 
+    /* Record the tx_data to keep track the operation */
+    call->hold_msg = (void*) tdata;
+
     /* Send the request */
     status = pjsip_inv_send_msg( call->inv, tdata);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Unable to send re-INVITE", status);
+        call->hold_msg = NULL;
         pjsip_dlg_dec_lock(dlg);
         return status;
@@ -4390 +4394 @@
             }
         }
-    }
+    } else if (tsx->role == PJSIP_ROLE_UAC &&
+               tsx->last_tx == (pjsip_tx_data*)call->hold_msg &&
+               tsx->state >= PJSIP_TSX_STATE_COMPLETED)
+    {
+        /* 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));
+        }
+    }
+