Changeset 5892

Timestamp:

Sep 26, 2018 5:58:47 AM (6 years ago)

Author:

ming

Message:

Fixed #2155: Cleanup call setting flag before sending reinvite on IP change

This changeset also clears PJSUA_CALL_UNHOLD flag after calling pjsua_call_set_hold/hold2()

Location:

pjproject/trunk/pjsip

Files:

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

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

@@ -691 +691 @@
                                   pj_bool_t async,
                                   pjsua_med_tp_state_cb cb);
+void pjsua_call_cleanup_flag(pjsua_call_setting *opt);
 void pjsua_set_media_tp_state(pjsua_call_media *call_med, pjsua_med_tp_st tp_st);
 

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

@@ -3951 +3951 @@
                 acc->ip_change_op = PJSUA_IP_CHANGE_OP_ACC_REINVITE_CALLS;
 
+                pjsua_call_cleanup_flag(&call_info.setting.flag);
                 call_info.setting.flag |=
                                          acc->cfg.ip_change_cfg.reinvite_flags;
@@ -3956 +3957 @@
                 PJ_LOG(3, (THIS_FILE, "call to %.*s: send "
                            "re-INVITE with flags 0x%x triggered "
-                           "by IP change",
+                           "by IP change (IP change flag: 0x%x)",
                            call_info.remote_info.slen,
                            call_info.remote_info.ptr,
+                           call_info.setting.flag,
                            acc->cfg.ip_change_cfg.reinvite_flags));
 

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

@@ -594 +594 @@
  * PJSUA_CALL_NO_SDP_OFFER, to be sticky (ticket #1793).
  */
-static void cleanup_call_setting_flag(pjsua_call_setting *opt)
+void pjsua_call_cleanup_flag(pjsua_call_setting *opt)
 {
     opt->flag &= ~(PJSUA_CALL_UNHOLD | PJSUA_CALL_UPDATE_CONTACT |
@@ -637 +637 @@
 
     if (!opt) {
-        cleanup_call_setting_flag(&call->opt);
+        pjsua_call_cleanup_flag(&call->opt);
         return PJ_SUCCESS;
     }
@@ -1309 +1309 @@
         /* Copy call setting from the replaced call */
         call->opt = replaced_call->opt;
-        cleanup_call_setting_flag(&call->opt);
+        pjsua_call_cleanup_flag(&call->opt);
 
         /* Notify application */
@@ -2701 +2701 @@
     call->local_hold = PJ_TRUE;
 
+    /* Clear unhold flag */
+    call->opt.flag &= ~PJSUA_CALL_UNHOLD;
+
 on_return:
     if (dlg) pjsip_dlg_dec_lock(dlg);
@@ -4397 +4400 @@
     }
 
-    cleanup_call_setting_flag(&call->opt);
+    pjsua_call_cleanup_flag(&call->opt);
     opt = call->opt;
 
@@ -4598 +4601 @@
 #endif
 
-    cleanup_call_setting_flag(&call->opt);
+    pjsua_call_cleanup_flag(&call->opt);
 
     if (pjsua_var.ua_cfg.cb.on_call_tx_offer) {
@@ -4915 +4918 @@
     }
 
-    cleanup_call_setting_flag(&existing_call->opt);
+    pjsua_call_cleanup_flag(&existing_call->opt);
     call_opt = existing_call->opt;
     if (pjsua_var.ua_cfg.cb.on_call_transfer_request2) {