From 1ff65e191b12b0494f7ff632f4a1e0c7e6ac1356 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Wed, 6 Apr 2011 15:16:20 +0200
Subject: [PATCH] Enable ipv6 support for Android.

---
 res/values/non_localizable_strings.xml      | 1 +
 res/values/strings.xml                      | 2 ++
 res/xml/preferences.xml                     | 3 +++
 src/org/linphone/LinphoneManager.java       | 2 ++
 src/org/linphone/core/LinphoneCoreImpl.java | 6 +++++-
 submodules/linphone                         | 2 +-
 6 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/res/values/non_localizable_strings.xml b/res/values/non_localizable_strings.xml
index 803beeed4..bbacf7bb1 100644
--- a/res/values/non_localizable_strings.xml
+++ b/res/values/non_localizable_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+	<string name="pref_ipv6_key">pref_ipv6_key</string>
 
 	<string name="pref_transport_udp_key">pref_transport_udp_key</string>
 	<string name="pref_transport_tcp_key">pref_transport_tcp_key</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 04fa39914..7954b6469 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+	<string name="pref_ipv6_title">Use ipv6 instead of ipv4</string>
+
 	<string name="error_while_accepting_pending_call">Error while accepting pending call</string>
 	<string name="incoming_call_dialog_title">%s is calling you</string>
 	<string name="accept">Accept</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index feb20595c..c46f8fe72 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -116,6 +116,9 @@
 			android:title="@string/pref_debug" android:enabled="true"></CheckBoxPreference>
 
 		<PreferenceScreen android:title="@string/pref_network_title">
+			<CheckBoxPreference android:key="@string/pref_ipv6_key"
+             android:title="@string/pref_ipv6_title" android:defaultValue="false" />
+		
 			<CheckBoxPreference android:key="@string/pref_transport_udp_key"
 			 android:title="@string/pref_transport_udp" android:defaultValue="true"/>
 			<CheckBoxPreference android:key="@string/pref_transport_tcp_key"
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 6fd51914d..b4c64ab25 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -329,6 +329,8 @@ public final class LinphoneManager implements LinphoneCoreListener {
 			mLc = LinphoneCoreFactory.instance().createLinphoneCore(
 					this, linphoneConfigFile, linphoneInitialConfigFile, null);
 
+			mLc.enableIpv6(mPref.getBoolean(getString(R.string.pref_ipv6_key), false));
+
 			mLc.setPlaybackGain(3);   
 			mLc.setRing(null);
 
diff --git a/src/org/linphone/core/LinphoneCoreImpl.java b/src/org/linphone/core/LinphoneCoreImpl.java
index 0ca1d2a06..81885d13a 100644
--- a/src/org/linphone/core/LinphoneCoreImpl.java
+++ b/src/org/linphone/core/LinphoneCoreImpl.java
@@ -93,7 +93,8 @@ class LinphoneCoreImpl implements LinphoneCore {
 	private native int startEchoCalibration(long nativePtr,Object data);
 	private native int getSignalingTransportPort(long nativePtr, int code);
 	private native void setSignalingTransportPorts(long nativePtr, int udp, int tcp, int tls);
-	
+	private native void enableIpv6(long nativePtr,boolean enable);
+
 	LinphoneCoreImpl(LinphoneCoreListener listener, File userConfig,File factoryConfig,Object  userdata) throws IOException {
 		mListener=listener;
 		nativePtr = newLinphoneCore(listener,userConfig.getCanonicalPath(),factoryConfig.getCanonicalPath(),userdata);
@@ -450,5 +451,8 @@ class LinphoneCoreImpl implements LinphoneCore {
 		setSignalingTransportPorts(nativePtr, transports.udp, transports.tcp, transports.tls);
 	}
 
+	public void enableIpv6(boolean enable) {
+		enableIpv6(nativePtr,enable);
+	}
 
 }
diff --git a/submodules/linphone b/submodules/linphone
index ceb6cd501..c807039a8 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit ceb6cd501759164d34c56d142c38dfbefdc7ad73
+Subproject commit c807039a86749ea5cdb58291af66f066060e49d2