Changeset 4456 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

Timestamp:

Apr 3, 2013 1:38:22 AM (12 years ago)

Author:

bennylp

Message:

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

File:

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

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

@@ -283 +283 @@
     }
 
+    /* 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.
@@ -350 +362 @@
             acc->rfc5626_regprm.slen = len;
         }
-    }
-
-    /* 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);
     }