Enable ipv6 support for Android.

This commit is contained in:
Guillaume Beraudo 2011-04-06 15:16:20 +02:00
parent 7e5f8cc458
commit 1ff65e191b
6 changed files with 14 additions and 2 deletions

View file

@ -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>

View file

@ -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>

View file

@ -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"

View file

@ -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);

View file

@ -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);
}
}

@ -1 +1 @@
Subproject commit ceb6cd501759164d34c56d142c38dfbefdc7ad73
Subproject commit c807039a86749ea5cdb58291af66f066060e49d2