Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0b6d0445: am ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1

Browse Source 
* commit '0b6d044567b9c3004eb7ed826fd593019cd24352':
  Fix adding of default route.
This commit is contained in:
Robert Greenwalt
2011-03-22 21:39:19 -07:00
committed by Android Git Automerger
parent 2f97217bfc 0b6d044567
commit 5635dc9313
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1404,10 +1404,13 @@ public class ConnectivityService extends IConnectivityManager.Stub {
if (TextUtils.isEmpty(interfaceName)) return;
for (InetAddress gateway : p.getGateways()) {
if (!NetworkUtils.addDefaultRoute(interfaceName, gateway) && DBG) {
NetworkInfo networkInfo = nt.getNetworkInfo();
log("addDefaultRoute for " + networkInfo.getTypeName() +
" (" + interfaceName + "), GatewayAddr=" + gateway.getHostAddress());
if (NetworkUtils.addHostRoute(interfaceName, gateway, null) &&
NetworkUtils.addDefaultRoute(interfaceName, gateway)) {
if (DBG) {
NetworkInfo networkInfo = nt.getNetworkInfo();
log("addDefaultRoute for " + networkInfo.getTypeName() +
" (" + interfaceName + "), GatewayAddr=" + gateway.getHostAddress());
}
}
}
}
@@ -1419,10 +1422,12 @@ public class ConnectivityService extends IConnectivityManager.Stub {
String interfaceName = p.getInterfaceName();
if (interfaceName != null) {
if ((NetworkUtils.removeDefaultRoute(interfaceName) >= 0) && DBG) {
NetworkInfo networkInfo = nt.getNetworkInfo();
log("removeDefaultRoute for " + networkInfo.getTypeName() + " (" +
interfaceName + ")");
if (NetworkUtils.removeDefaultRoute(interfaceName) >= 0) {
if (DBG) {
NetworkInfo networkInfo = nt.getNetworkInfo();
log("removeDefaultRoute for " + networkInfo.getTypeName() + " (" +
interfaceName + ")");
}
}
}
}