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

am cdee9727: Merge "Make isHostRoute match only host routes" into jb-mr2-dev

Browse Source 
* commit 'cdee9727e26721910a44ba67980b39de4b103f7d':
  Make isHostRoute match only host routes
This commit is contained in:
Lorenzo Colitti
2013-03-27 15:04:42 -07:00
committed by Android Git Automerger
parent 0e67b3f3a5 aff5413507
commit 7da283b440
2 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/net/RouteInfo.java
View File

@@ -132,7 +132,10 @@ public class RouteInfo implements Parcelable {
}
private boolean isHost() {
return (mGateway.equals(Inet4Address.ANY) || mGateway.equals(Inet6Address.ANY));
return (mDestination.getAddress() instanceof Inet4Address &&
mDestination.getNetworkPrefixLength() == 32) ||
(mDestination.getAddress() instanceof Inet6Address &&
mDestination.getNetworkPrefixLength() == 128);
}
private boolean isDefault() {

34
core/tests/coretests/src/android/net/RouteInfoTest.java
View File

@@ -149,6 +149,40 @@ public class RouteInfoTest extends TestCase {
assertAreNotEqual(r1, r3);
}
public void testHostRoute() {
RouteInfo r;
r = new RouteInfo(Prefix("0.0.0.0/0"), Address("0.0.0.0"), "wlan0");
assertFalse(r.isHostRoute());
r = new RouteInfo(Prefix("::/0"), Address("::"), "wlan0");
assertFalse(r.isHostRoute());
r = new RouteInfo(Prefix("192.0.2.0/24"), null, "wlan0");
assertFalse(r.isHostRoute());
r = new RouteInfo(Prefix("2001:db8::/48"), null, "wlan0");
assertFalse(r.isHostRoute());
r = new RouteInfo(Prefix("192.0.2.0/32"), Address("0.0.0.0"), "wlan0");
assertTrue(r.isHostRoute());
r = new RouteInfo(Prefix("2001:db8::/128"), Address("::"), "wlan0");
assertTrue(r.isHostRoute());
r = new RouteInfo(Prefix("192.0.2.0/32"), null, "wlan0");
assertTrue(r.isHostRoute());
r = new RouteInfo(Prefix("2001:db8::/128"), null, "wlan0");
assertTrue(r.isHostRoute());
r = new RouteInfo(Prefix("::/128"), Address("fe80::"), "wlan0");
assertTrue(r.isHostRoute());
r = new RouteInfo(Prefix("0.0.0.0/32"), Address("192.0.2.1"), "wlan0");
assertTrue(r.isHostRoute());
}
public RouteInfo passThroughParcel(RouteInfo r) {
Parcel p = Parcel.obtain();
RouteInfo r2 = null;