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

am 355205c0: Switch to use netd to add/remove routes.

Browse Source 
* commit '355205c0cd712fb964cd47ec7f65616808d5ef75':
  Switch to use netd to add/remove routes.
This commit is contained in:
Robert Greenwalt
2011-05-18 16:33:16 -07:00
committed by Android Git Automerger
parent a9f139c4f0 355205c0cd
commit f024027b55
4 changed files with 107 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
services/java/com/android/server/ConnectivityService.java
View File

@@ -26,6 +26,7 @@ import android.net.ConnectivityManager;
import android.net.DummyDataStateTracker;
import android.net.EthernetDataTracker;
import android.net.IConnectivityManager;
import android.net.LinkAddress;
import android.net.LinkProperties;
import android.net.MobileDataStateTracker;
import android.net.NetworkConfig;
@@ -41,6 +42,7 @@ import android.os.Binder;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.IBinder;
import android.os.INetworkManagementService;
import android.os.Looper;
import android.os.Message;
import android.os.PowerManager;
@@ -60,6 +62,7 @@ import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
import java.net.InetAddress;
import java.net.Inet4Address;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Collection;
@@ -124,6 +127,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
private AtomicBoolean mBackgroundDataEnabled = new AtomicBoolean(true);
private INetworkManagementService mNetd;
private static final int ENABLED = 1;
private static final int DISABLED = 0;
@@ -929,10 +934,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
* @return {@code true} on success, {@code false} on failure
*/
private boolean addHostRoute(NetworkStateTracker nt, InetAddress hostAddress, int cycleCount) {
if (nt.getNetworkInfo().getType() == ConnectivityManager.TYPE_WIFI) {
return false;
}
LinkProperties lp = nt.getLinkProperties();
if ((lp == null) || (hostAddress == null)) return false;
@@ -947,20 +948,28 @@ public class ConnectivityService extends IConnectivityManager.Stub {
}
RouteInfo bestRoute = RouteInfo.selectBestRoute(lp.getRoutes(), hostAddress);
InetAddress gateway = null;
InetAddress gatewayAddress = null;
if (bestRoute != null) {
gateway = bestRoute.getGateway();
gatewayAddress = bestRoute.getGateway();
// if the best route is ourself, don't relf-reference, just add the host route
if (hostAddress.equals(gateway)) gateway = null;
if (hostAddress.equals(gatewayAddress)) gatewayAddress = null;
}
if (gateway != null) {
if (gatewayAddress != null) {
if (cycleCount > MAX_HOSTROUTE_CYCLE_COUNT) {
loge("Error adding hostroute - too much recursion");
return false;
}
if (!addHostRoute(nt, gateway, cycleCount+1)) return false;
if (!addHostRoute(nt, gatewayAddress, cycleCount+1)) return false;
}
RouteInfo route = RouteInfo.makeHostRoute(hostAddress, gatewayAddress);
try {
mNetd.addRoute(interfaceName, route);
return true;
} catch (Exception ex) {
return false;
}
return NetworkUtils.addHostRoute(interfaceName, hostAddress, gateway);
}
// TODO support the removal of single host routes. Keep a ref count of them so we
@@ -1287,6 +1296,9 @@ public class ConnectivityService extends IConnectivityManager.Stub {
}
void systemReady() {
IBinder b = ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE);
mNetd = INetworkManagementService.Stub.asInterface(b);
synchronized(this) {
mSystemReady = true;
if (mInitialBroadcast != null) {
@@ -1423,7 +1435,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
if (interfaceName != null && !privateDnsRouteSet) {
Collection<InetAddress> dnsList = p.getDnses();
for (InetAddress dns : dnsList) {
if (DBG) log(" adding " + dns);
addHostRoute(nt, dns, 0);
}
nt.privateDnsRouteSet(true);
@@ -1431,8 +1442,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
}
private void removePrivateDnsRoutes(NetworkStateTracker nt) {
// TODO - we should do this explicitly but the NetUtils api doesnt
// support this yet - must remove all. No worse than before
LinkProperties p = nt.getLinkProperties();
if (p == null) return;
String interfaceName = p.getInterfaceName();
@@ -1442,7 +1451,17 @@ public class ConnectivityService extends IConnectivityManager.Stub {
log("removePrivateDnsRoutes for " + nt.getNetworkInfo().getTypeName() +
" (" + interfaceName + ")");
}
NetworkUtils.removeHostRoutes(interfaceName);
Collection<InetAddress> dnsList = p.getDnses();
for (InetAddress dns : dnsList) {
if (DBG) log(" removing " + dns);
RouteInfo route = RouteInfo.makeHostRoute(dns);
try {
mNetd.removeRoute(interfaceName, route);
} catch (Exception ex) {
loge("error (" + ex + ") removing dns route " + route);
}
}
nt.privateDnsRouteSet(false);
}
}
@@ -1453,19 +1472,27 @@ public class ConnectivityService extends IConnectivityManager.Stub {
if (p == null) return;
String interfaceName = p.getInterfaceName();
if (TextUtils.isEmpty(interfaceName)) return;
for (RouteInfo route : p.getRoutes()) {
for (RouteInfo route : p.getRoutes()) {
//TODO - handle non-default routes
if (route.isDefaultRoute()) {
if (DBG) log("adding default route " + route);
InetAddress gateway = route.getGateway();
if (addHostRoute(nt, gateway, 0) &&
NetworkUtils.addDefaultRoute(interfaceName, gateway)) {
if (addHostRoute(nt, gateway, 0)) {
try {
mNetd.addRoute(interfaceName, route);
} catch (Exception e) {
loge("error adding default route " + route);
continue;
}
if (DBG) {
NetworkInfo networkInfo = nt.getNetworkInfo();
log("addDefaultRoute for " + networkInfo.getTypeName() +
" (" + interfaceName + "), GatewayAddr=" +
gateway.getHostAddress());
}
} else {
loge("error adding host route for default route " + route);
}
}
}
@@ -1477,8 +1504,17 @@ public class ConnectivityService extends IConnectivityManager.Stub {
if (p == null) return;
String interfaceName = p.getInterfaceName();
if (interfaceName != null) {
if (NetworkUtils.removeDefaultRoute(interfaceName) >= 0) {
if (interfaceName == null) return;
for (RouteInfo route : p.getRoutes()) {
//TODO - handle non-default routes
if (route.isDefaultRoute()) {
try {
mNetd.removeRoute(interfaceName, route);
} catch (Exception ex) {
loge("error (" + ex + ") removing default route " + route);
continue;
}
if (DBG) {
NetworkInfo networkInfo = nt.getNetworkInfo();
log("removeDefaultRoute for " + networkInfo.getTypeName() + " (" +