Changeset 5492 for pjproject


Ignore:
Timestamp:
Dec 6, 2016 10:58:48 AM (7 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:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

    r5490 r5492  
    41124112    } 
    41134113 
     4114    cleanup_call_setting_flag(&call->opt); 
     4115 
    41144116    if (pjsua_var.ua_cfg.cb.on_call_rx_offer) { 
    41154117        pjsip_status_code code = PJSIP_SC_OK; 
    41164118        pjsua_call_setting opt; 
    41174119 
    4118         cleanup_call_setting_flag(&call->opt); 
    41194120        opt = call->opt; 
    4120  
    41214121        (*pjsua_var.ua_cfg.cb.on_call_rx_offer)(call->index, offer, NULL, 
    41224122                                                &code, &opt); 
     
    42444244#endif 
    42454245 
     4246    cleanup_call_setting_flag(&call->opt); 
     4247 
    42464248    if (pjsua_var.ua_cfg.cb.on_call_tx_offer) { 
    4247         cleanup_call_setting_flag(&call->opt); 
    42484249        (*pjsua_var.ua_cfg.cb.on_call_tx_offer)(call->index, NULL, 
    42494250                                                &call->opt); 
Note: See TracChangeset for help on using the changeset viewer.