joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Switch to use netd to add/remove routes.

Browse source 
Also adds support for v6 routes and for removing single routes.

Change-Id: I1c4f08c7938371090944d8d6f603e1e0d6d70c01
This commit is contained in:
Robert Greenwalt 2011-05-10 15:05:02 -07:00
commit 355205c0cd
1 changed files with 107 additions and 169 deletions
Download patch file Download diff file Expand all files Collapse all files

32
core/java/android/net/RouteInfo.java
View file

@ -46,18 +46,16 @@ public class RouteInfo implements Parcelable {
public RouteInfo(LinkAddress destination, InetAddress gateway) {
if (destination == null) {
try {
if (gateway != null) {
if (gateway instanceof Inet4Address) {
destination = new LinkAddress(Inet4Address.ANY, 0);
} else {
destination = new LinkAddress(Inet6Address.ANY, 0);
}
if (gateway != null) {
if (gateway instanceof Inet4Address) {
destination = new LinkAddress(Inet4Address.ANY, 0);
} else {
// no destination, no gateway. invalid.
throw new RuntimeException("Invalid arguments passed in.");
destination = new LinkAddress(Inet6Address.ANY, 0);
}
} catch (Exception e) {}
} else {
// no destination, no gateway. invalid.
throw new RuntimeException("Invalid arguments passed in.");
}
}
if (gateway == null) {
if (destination.getAddress() instanceof Inet4Address) {
@ -76,6 +74,20 @@ public class RouteInfo implements Parcelable {
this(null, gateway);
}
public static RouteInfo makeHostRoute(InetAddress host) {
return makeHostRoute(host, null);
}
public static RouteInfo makeHostRoute(InetAddress host, InetAddress gateway) {
if (host == null) return null;
if (host instanceof Inet4Address) {
return new RouteInfo(new LinkAddress(host, 32), gateway);
} else {
return new RouteInfo(new LinkAddress(host, 128), gateway);
}
}
private boolean isDefault() {
boolean val = false;
if (mGateway != null) {