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

am e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTE

Browse Source 
* commit 'e6848faceff58f84f671dbc73be08ef7890fea09':
  Fix the adding of host routes.
This commit is contained in:
Robert Greenwalt
2011-05-10 11:53:57 -07:00
committed by Android Git Automerger
parent df6da5c96b bd49221570
commit f490d72195
3 changed files with 132 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,6 +81,10 @@ public class ConnectivityService extends IConnectivityManager.Stub {
private static final String NETWORK_RESTORE_DELAY_PROP_NAME =
"android.telephony.apn-restore";
// used in recursive route setting to add gateways for the host for which
// a host route was requested.
private static final int MAX_HOSTROUTE_CYCLE_COUNT = 10;
private Tethering mTethering;
private boolean mTetheringConfigValid = false;
@@ -911,7 +915,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
}
try {
InetAddress addr = InetAddress.getByAddress(hostAddress);
return addHostRoute(tracker, addr);
return addHostRoute(tracker, addr, 0);
} catch (UnknownHostException e) {}
return false;
}
@@ -924,24 +928,45 @@ public class ConnectivityService extends IConnectivityManager.Stub {
* TODO - deprecate
* @return {@code true} on success, {@code false} on failure
*/
private boolean addHostRoute(NetworkStateTracker nt, InetAddress hostAddress) {
private boolean addHostRoute(NetworkStateTracker nt, InetAddress hostAddress, int cycleCount) {
if (nt.getNetworkInfo().getType() == ConnectivityManager.TYPE_WIFI) {
return false;
}
LinkProperties p = nt.getLinkProperties();
if (p == null) return false;
String interfaceName = p.getInterfaceName();
LinkProperties lp = nt.getLinkProperties();
if ((lp == null) || (hostAddress == null)) return false;
String interfaceName = lp.getInterfaceName();
if (DBG) {
log("Requested host route to " + hostAddress + "(" + interfaceName + ")");
log("Requested host route to " + hostAddress + "(" + interfaceName + "), cycleCount=" +
cycleCount);
}
if (interfaceName != null) {
return NetworkUtils.addHostRoute(interfaceName, hostAddress, null);
} else {
if (interfaceName == null) {
if (DBG) loge("addHostRoute failed due to null interface name");
return false;
}
RouteInfo bestRoute = RouteInfo.selectBestRoute(lp.getRoutes(), hostAddress);
InetAddress gateway = null;
if (bestRoute != null) {
gateway = bestRoute.getGateway();
// if the best route is ourself, don't relf-reference, just add the host route
if (hostAddress.equals(gateway)) gateway = null;
}
if (gateway != null) {
if (cycleCount > MAX_HOSTROUTE_CYCLE_COUNT) {
loge("Error adding hostroute - too much recursion");
return false;
}
if (!addHostRoute(nt, gateway, cycleCount+1)) return false;
}
return NetworkUtils.addHostRoute(interfaceName, hostAddress, gateway);
}
// TODO support the removal of single host routes. Keep a ref count of them so we
// aren't over-zealous
private boolean removeHostRoute(NetworkStateTracker nt, InetAddress hostAddress) {
return false;
}
/**
@@ -1393,7 +1418,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
Collection<InetAddress> dnsList = p.getDnses();
for (InetAddress dns : dnsList) {
if (DBG) log(" adding " + dns);
NetworkUtils.addHostRoute(interfaceName, dns, null);
addHostRoute(nt, dns, 0);
}
nt.privateDnsRouteSet(true);
}
@@ -1427,7 +1452,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
//TODO - handle non-default routes
if (route.isDefaultRoute()) {
InetAddress gateway = route.getGateway();
if (NetworkUtils.addHostRoute(interfaceName, gateway, null) &&
if (addHostRoute(nt, gateway, 0) &&
NetworkUtils.addDefaultRoute(interfaceName, gateway)) {
if (DBG) {
NetworkInfo networkInfo = nt.getNetworkInfo();