LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support 464xlat on Ethernet. am: 6a6903553b am: fbf7f85029

Browse Source 
am: 9c129cccac

* commit '9c129cccac2a14ac2e4369e52134d2cb95e9da28':
  Support 464xlat on Ethernet.
This commit is contained in:
Lorenzo Colitti
2016-03-03 08:55:16 +00:00
committed by android-build-merger
parent 68f220aabb fbf7f85029
commit dd29cf55ce
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/connectivity/Nat464Xlat.java
View File

@@ -16,13 +16,11 @@
package com.android.server.connectivity; package com.android.server.connectivity;
import static android.net.ConnectivityManager.TYPE_MOBILE;
import static android.net.ConnectivityManager.TYPE_WIFI;
import java.net.Inet4Address; import java.net.Inet4Address;
import android.content.Context; import android.content.Context;
import android.net.InterfaceConfiguration; import android.net.InterfaceConfiguration;
import android.net.ConnectivityManager;
import android.net.LinkAddress; import android.net.LinkAddress;
import android.net.LinkProperties; import android.net.LinkProperties;
import android.net.NetworkAgent; import android.net.NetworkAgent;
@@ -34,6 +32,7 @@ import android.os.RemoteException;
import android.util.Slog; import android.util.Slog;
import com.android.server.net.BaseNetworkObserver; import com.android.server.net.BaseNetworkObserver;
import com.android.internal.util.ArrayUtils;
/** /**
* @hide * @hide
@@ -46,6 +45,13 @@ public class Nat464Xlat extends BaseNetworkObserver {
// This must match the interface prefix in clatd.c. // This must match the interface prefix in clatd.c.
private static final String CLAT_PREFIX = "v4-"; private static final String CLAT_PREFIX = "v4-";
// The network types we will start clatd on.
private static final int[] NETWORK_TYPES = {
ConnectivityManager.TYPE_MOBILE,
ConnectivityManager.TYPE_WIFI,
ConnectivityManager.TYPE_ETHERNET,
};
private final INetworkManagementService mNMService; private final INetworkManagementService mNMService;
// ConnectivityService Handler for LinkProperties updates. // ConnectivityService Handler for LinkProperties updates.
@@ -90,7 +96,7 @@ public class Nat464Xlat extends BaseNetworkObserver {
(nai.linkProperties != null) ? nai.linkProperties.hasIPv4Address() : false; (nai.linkProperties != null) ? nai.linkProperties.hasIPv4Address() : false;
// Only support clat on mobile and wifi for now, because these are the only IPv6-only // Only support clat on mobile and wifi for now, because these are the only IPv6-only
// networks we can connect to. // networks we can connect to.
return connected && !hasIPv4Address && (netType == TYPE_MOBILE || netType == TYPE_WIFI); return connected && !hasIPv4Address && ArrayUtils.contains(NETWORK_TYPES, netType);
} }
/** /**
@@ -221,7 +227,7 @@ public class Nat464Xlat extends BaseNetworkObserver {
} }
private void maybeSetIpv6NdOffload(String iface, boolean on) { private void maybeSetIpv6NdOffload(String iface, boolean on) {
if (mNetwork.networkInfo.getType() != TYPE_WIFI) { if (mNetwork.networkInfo.getType() != ConnectivityManager.TYPE_WIFI) {
return; return;
} }
try { try {