Changeset 5492

Timestamp:

Dec 6, 2016 10:58:48 AM (8 years ago)

Author:

ming

Message:

Re #1982: Cleanup call setting flags even if callbacks on_call_tx/rx_offer() not implemented
Otherwise this could cause media to be unintentionally reinitialized on re-INVITEs/updates.
Refer to ticket #1793.

File:

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

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

@@ -4112 +4112 @@
     }
 
+    cleanup_call_setting_flag(&call->opt);
+
     if (pjsua_var.ua_cfg.cb.on_call_rx_offer) {
         pjsip_status_code code = PJSIP_SC_OK;
         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,
                                                 &code, &opt);
@@ -4244 +4244 @@
 #endif
 
+    cleanup_call_setting_flag(&call->opt);
+
     if (pjsua_var.ua_cfg.cb.on_call_tx_offer) {
-        cleanup_call_setting_flag(&call->opt);
         (*pjsua_var.ua_cfg.cb.on_call_tx_offer)(call->index, NULL,
                                                 &call->opt);