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

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4456 74dad513-b988-da41-8d7b-12977e46ad98

1 files changed, 12 insertions, 12 deletions

diff --git a/pjsip/src/pjsua-lib/pjsua_acc.c b/pjsip/src/pjsua-lib/pjsua_acc.c
index 38a5aefb..70a59eeb 100644
--- a/pjsip/src/pjsua-lib/pjsua_acc.c
+++ b/pjsip/src/pjsua-lib/pjsua_acc.c
@@ -282,6 +282,18 @@ static pj_status_t initialize_acc(unsigned acc_id)
 	acc->cred[acc->cred_cnt++] = pjsua_var.ua_cfg.cred_info[i];
     }
 
+    /* If account's ICE and TURN customization is not set, then
+     * initialize it with the settings from the global media config.
+     */
+    if (acc->cfg.ice_cfg_use == PJSUA_ICE_CONFIG_USE_DEFAULT) {
+	pjsua_ice_config_from_media_config(NULL, &acc->cfg.ice_cfg,
+	                                &pjsua_var.media_cfg);
+    }
+    if (acc->cfg.turn_cfg_use == PJSUA_TURN_CONFIG_USE_DEFAULT) {
+	pjsua_turn_config_from_media_config(NULL, &acc->cfg.turn_cfg,
+	                                    &pjsua_var.media_cfg);
+    }
+
     /* If ICE is enabled, add "+sip.ice" media feature tag in account's
      * contact params.
      */
@@ -351,18 +363,6 @@ static pj_status_t initialize_acc(unsigned acc_id)
 	}
     }
 
-    /* If account's ICE and TURN customization is not set, then
-     * initialize it with the settings from the global media config.
-     */
-    if (acc->cfg.ice_cfg_use == PJSUA_ICE_CONFIG_USE_DEFAULT) {
-	pjsua_ice_config_from_media_config(NULL, &acc->cfg.ice_cfg,
-	                                &pjsua_var.media_cfg);
-    }
-    if (acc->cfg.turn_cfg_use == PJSUA_TURN_CONFIG_USE_DEFAULT) {
-	pjsua_turn_config_from_media_config(NULL, &acc->cfg.turn_cfg,
-	                                    &pjsua_var.media_cfg);
-    }
-
     /* Mark account as valid */
     pjsua_var.acc[acc_id].valid = PJ_TRUE;