Changeset 6083

Timestamp:

Oct 2, 2019 3:42:13 AM (5 years ago)

Author:

ming

Message:

Fixed #2238: Local hold is not reset if there's failure during reinvite/update

We set local_hold later, after sending the message is successful.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c (modified) (4 diffs)

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

@@ -3029 +3029 @@
                                                 call->inv->pool_prov,
                                                 NULL, &sdp, NULL);
-        call->local_hold = PJ_FALSE;
     }
     if (status != PJ_SUCCESS) {
@@ -3072 +3071 @@
     call->med_update_success = PJ_FALSE;
     status = pjsip_inv_send_msg( call->inv, tdata);
-    if (status != PJ_SUCCESS) {
+    if (status == PJ_SUCCESS &&
+        ((call->opt.flag & PJSUA_CALL_UNHOLD) &&
+         (call->opt.flag & PJSUA_CALL_NO_SDP_OFFER) == 0))
+    {
+        call->local_hold = PJ_FALSE;
+    } else if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Unable to send re-INVITE", status);
         goto on_return;
@@ -3156 +3160 @@
                                                 call->inv->pool_prov,
                                                 NULL, &sdp, NULL);
-        call->local_hold = PJ_FALSE;
     }
 
@@ -3200 +3203 @@
     call->med_update_success = PJ_FALSE;
     status = pjsip_inv_send_msg( call->inv, tdata);
-    if (status != PJ_SUCCESS) {
+    if (status == PJ_SUCCESS &&
+        ((call->opt.flag & PJSUA_CALL_UNHOLD) &&
+         (call->opt.flag & PJSUA_CALL_NO_SDP_OFFER) == 0))
+    {
+        call->local_hold = PJ_FALSE;
+    } else if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Unable to send UPDATE request", status);
         goto on_return;