Changeset 4929 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

Sep 24, 2014 8:26:33 AM (10 years ago)

Author:

nanang

Message:

Close #1793: Avoid call setting flags PJSUA_CALL_UNHOLD, PJSUA_CALL_UPDATE_CONTACT, and PJSUA_CALL_NO_SDP_OFFER to be sticky or reused in the next calls of pjsua_call_reinvite/update().

File:

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

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

@@ -557 +557 @@
 
 /*
+ * Cleanup call setting flag to avoid one time flags, such as
+ * PJSUA_CALL_UNHOLD, PJSUA_CALL_UPDATE_CONTACT, or
+ * PJSUA_CALL_NO_SDP_OFFER, to be sticky (ticket #1793).
+ */
+static void cleanup_call_setting_flag(pjsua_call_setting *opt)
+{
+    opt->flag &= ~(PJSUA_CALL_UNHOLD | PJSUA_CALL_UPDATE_CONTACT |
+                   PJSUA_CALL_NO_SDP_OFFER);
+}
+
+
+/*
  * Initialize call settings based on account ID.
  */
@@ -580 +592 @@
     pj_assert(call);
 
-    if (!opt)
+    if (!opt) {
+        cleanup_call_setting_flag(&call->opt);
         return PJ_SUCCESS;
+    }
 
 #if !PJMEDIA_HAS_VIDEO
@@ -1146 +1160 @@
         /* Copy call setting from the replaced call */
         call->opt = replaced_call->opt;
+        cleanup_call_setting_flag(&call->opt);
 
         /* Notify application */
@@ -2411 +2426 @@
         call->opt.flag = options;
 
-    status = pjsua_call_reinvite2(call_id, NULL, msg_data);
+    status = pjsua_call_reinvite2(call_id, &call->opt, msg_data);
 
 on_return:
@@ -2525 +2540 @@
         call->opt.flag = options;
 
-    status = pjsua_call_update2(call_id, NULL, msg_data);
+    status = pjsua_call_update2(call_id, &call->opt, msg_data);
 
 on_return:
@@ -3952 +3967 @@
     if (pjsua_var.ua_cfg.cb.on_call_rx_offer) {
         pjsip_status_code code = PJSIP_SC_OK;
-        pjsua_call_setting opt = call->opt;
+        pjsua_call_setting opt;
+
+        cleanup_call_setting_flag(&call->opt);
+        opt = call->opt;
 
         (*pjsua_var.ua_cfg.cb.on_call_rx_offer)(call->index, offer, NULL,
@@ -4374 +4392 @@
     }
 
+    cleanup_call_setting_flag(&existing_call->opt);
     call_opt = existing_call->opt;
     if (pjsua_var.ua_cfg.cb.on_call_transfer_request2) {
@@ -4677 +4696 @@
         {
             /* Call unhold failed */
-            call->opt.flag &= ~PJSUA_CALL_UNHOLD;
             call->local_hold = PJ_TRUE;
             PJ_LOG(3,(THIS_FILE, "Error releasing hold on call %d (reason=%d)",