From b3f5d7f260942e555d2d8dd994ebc6260cca30d8 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 20 Aug 2012 10:14:14 +0200
Subject: [PATCH] Add ICE configuration parameter.

---
 Classes/LinphoneCoreSettingsStore.m         | 10 +++++++++-
 Settings/InAppSettings.bundle/Network.plist | 10 ++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m
index 86bd9814a..f776bc624 100644
--- a/Classes/LinphoneCoreSettingsStore.m
+++ b/Classes/LinphoneCoreSettingsStore.m
@@ -155,6 +155,9 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
 	}
 	{
 		[self setString: linphone_core_get_stun_server(lc) forKey:@"stun_preference"];
+        [self
+            setInteger:lp_config_get_int(linphone_core_get_config(lc),"app","ice_preference"
+            , 0) forKey:@"ice_preference"];
 	}
 	
 	{
@@ -429,7 +432,12 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
     NSString* stun_server = [self stringForKey:@"stun_preference"];
     if ([stun_server length] > 0){
         linphone_core_set_stun_server(lc,[stun_server cStringUsingEncoding:[NSString defaultCStringEncoding]]);
-        linphone_core_set_firewall_policy(lc, LinphonePolicyUseStun);
+        BOOL ice_preference = [self boolForKey:@"ice_preference"];
+        if(ice_preference) {
+            linphone_core_set_firewall_policy(lc, LinphonePolicyUseIce);
+        } else {
+            linphone_core_set_firewall_policy(lc, LinphonePolicyUseStun);
+        }
     } else {
         linphone_core_set_stun_server(lc, NULL);
         linphone_core_set_firewall_policy(lc, LinphonePolicyNoFirewall);
diff --git a/Settings/InAppSettings.bundle/Network.plist b/Settings/InAppSettings.bundle/Network.plist
index 0f067d74f..c8a4ac946 100644
--- a/Settings/InAppSettings.bundle/Network.plist
+++ b/Settings/InAppSettings.bundle/Network.plist
@@ -28,6 +28,16 @@
 			<key>DefaultValue</key>
 			<string></string>
 		</dict>
+		<dict>
+			<key>Title</key>
+			<string>ICE</string>
+			<key>Key</key>
+			<string>ice_preference</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+			<key>DefaultValue</key>
+			<false/>
+		</dict>
 		<dict>
 			<key>Type</key>
 			<string>PSToggleSwitchSpecifier</string>