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

am 50f9d93a: am 68c9c5aa: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev

Browse Source 
automerge: 7325a9d

* commit '7325a9da748e0d02301a071ec73bcc33acf79d7f':
  Support connecting to networks with misconfigured subnet masks.
This commit is contained in:
Lorenzo Colitti
2015-01-23 13:05:26 +00:00
committed by android-build-merger
parent 2530cf6f9f 7325a9da74
commit 6c1da05211
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/net/StaticIpConfiguration.java
View File

@@ -76,15 +76,22 @@ public class StaticIpConfiguration implements Parcelable {
/**
* Returns the network routes specified by this object. Will typically include a
* directly-connected route for the IP address's local subnet and a default route.
* directly-connected route for the IP address's local subnet and a default route. If the
* default gateway is not covered by the directly-connected route, it will also contain a host
* route to the gateway as well. This configuration is arguably invalid, but it used to work
* in K and earlier, and other OSes appear to accept it.
*/
public List<RouteInfo> getRoutes(String iface) {
List<RouteInfo> routes = new ArrayList<RouteInfo>(2);
List<RouteInfo> routes = new ArrayList<RouteInfo>(3);
if (ipAddress != null) {
routes.add(new RouteInfo(ipAddress, null, iface));
RouteInfo connectedRoute = new RouteInfo(ipAddress, null, iface);
routes.add(connectedRoute);
if (gateway != null && !connectedRoute.matches(gateway)) {
routes.add(RouteInfo.makeHostRoute(gateway, iface));
}
}
if (gateway != null) {
routes.add(new RouteInfo((LinkAddress) null, gateway, iface));
routes.add(new RouteInfo((IpPrefix) null, gateway, iface));
}
return routes;
}