drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix adding of default route." into honeycomb-mr1

Browse Source
This commit is contained in:
Robert Greenwalt
2011-03-22 21:36:04 -07:00
committed by Android (Google) Code Review
parent 5e66ccf5c4 edcb4f9d56
commit ac70fb8be6
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1415,13 +1415,16 @@ public class ConnectivityService extends IConnectivityManager.Stub {
if (TextUtils.isEmpty(interfaceName)) return; if (TextUtils.isEmpty(interfaceName)) return;
for (InetAddress gateway : p.getGateways()) { for (InetAddress gateway : p.getGateways()) {
if (!NetworkUtils.addDefaultRoute(interfaceName, gateway) && DBG) { if (NetworkUtils.addHostRoute(interfaceName, gateway, null) &&
NetworkUtils.addDefaultRoute(interfaceName, gateway)) {
if (DBG) {
NetworkInfo networkInfo = nt.getNetworkInfo(); NetworkInfo networkInfo = nt.getNetworkInfo();
log("addDefaultRoute for " + networkInfo.getTypeName() + log("addDefaultRoute for " + networkInfo.getTypeName() +
" (" + interfaceName + "), GatewayAddr=" + gateway.getHostAddress()); " (" + interfaceName + "), GatewayAddr=" + gateway.getHostAddress());
} }
} }
} }
}
public void removeDefaultRoute(NetworkStateTracker nt) { public void removeDefaultRoute(NetworkStateTracker nt) {
@ -1430,13 +1433,15 @@ public class ConnectivityService extends IConnectivityManager.Stub {
String interfaceName = p.getInterfaceName(); String interfaceName = p.getInterfaceName();
if (interfaceName != null) { if (interfaceName != null) {
if ((NetworkUtils.removeDefaultRoute(interfaceName) >= 0) && DBG) { if (NetworkUtils.removeDefaultRoute(interfaceName) >= 0) {
if (DBG) {
NetworkInfo networkInfo = nt.getNetworkInfo(); NetworkInfo networkInfo = nt.getNetworkInfo();
log("removeDefaultRoute for " + networkInfo.getTypeName() + " (" + log("removeDefaultRoute for " + networkInfo.getTypeName() + " (" +
interfaceName + ")"); interfaceName + ")");
} }
} }
} }
}
/** /**
* Reads the network specific TCP buffer sizes from SystemProperties * Reads the network specific TCP buffer sizes from SystemProperties