Changeset 4456


Ignore:
Timestamp:
Apr 3, 2013 1:38:22 AM (6 years ago)
Author:
bennylp
Message:

Fixed #1652: Media feature tag "+sip.ice" is not used because of wrong account initialization sequence

File:
1 edited

Legend:

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

    r4436 r4456  
    283283    } 
    284284 
     285    /* If account's ICE and TURN customization is not set, then 
     286     * initialize it with the settings from the global media config. 
     287     */ 
     288    if (acc->cfg.ice_cfg_use == PJSUA_ICE_CONFIG_USE_DEFAULT) { 
     289        pjsua_ice_config_from_media_config(NULL, &acc->cfg.ice_cfg, 
     290                                        &pjsua_var.media_cfg); 
     291    } 
     292    if (acc->cfg.turn_cfg_use == PJSUA_TURN_CONFIG_USE_DEFAULT) { 
     293        pjsua_turn_config_from_media_config(NULL, &acc->cfg.turn_cfg, 
     294                                            &pjsua_var.media_cfg); 
     295    } 
     296 
    285297    /* If ICE is enabled, add "+sip.ice" media feature tag in account's 
    286298     * contact params. 
     
    350362            acc->rfc5626_regprm.slen = len; 
    351363        } 
    352     } 
    353  
    354     /* If account's ICE and TURN customization is not set, then 
    355      * initialize it with the settings from the global media config. 
    356      */ 
    357     if (acc->cfg.ice_cfg_use == PJSUA_ICE_CONFIG_USE_DEFAULT) { 
    358         pjsua_ice_config_from_media_config(NULL, &acc->cfg.ice_cfg, 
    359                                         &pjsua_var.media_cfg); 
    360     } 
    361     if (acc->cfg.turn_cfg_use == PJSUA_TURN_CONFIG_USE_DEFAULT) { 
    362         pjsua_turn_config_from_media_config(NULL, &acc->cfg.turn_cfg, 
    363                                             &pjsua_var.media_cfg); 
    364364    } 
    365365 
Note: See TracChangeset for help on using the changeset viewer.