Switch to use netd to add/remove routes.
Also adds support for v6 routes and for removing single routes. Change-Id: I1c4f08c7938371090944d8d6f603e1e0d6d70c01
This commit is contained in:
Robert Greenwalt
parent
3a34041f80
commit
355205c0cd
2 changed files with 107 additions and 169 deletions
|
|
@ -38,32 +38,6 @@ public class NetworkUtils {
|
|||
/** Bring the named network interface down. */
|
||||
public native static int disableInterface(String interfaceName);
|
||||
|
||||
/**
|
||||
* Add a route to the routing table.
|
||||
*
|
||||
* @param interfaceName the interface to route through.
|
||||
* @param dst the network or host to route to. May be IPv4 or IPv6, e.g.
|
||||
* "0.0.0.0" or "2001:4860::".
|
||||
* @param prefixLength the prefix length of the route.
|
||||
* @param gw the gateway to use, e.g., "192.168.251.1". If null,
|
||||
* indicates a directly-connected route.
|
||||
*/
|
||||
public native static int addRoute(String interfaceName, String dst,
|
||||
int prefixLength, String gw);
|
||||
|
||||
/** Return the gateway address for the default route for the named interface. */
|
||||
public static InetAddress getDefaultRoute(String interfaceName) {
|
||||
int addr = getDefaultRouteNative(interfaceName);
|
||||
return intToInetAddress(addr);
|
||||
}
|
||||
private native static int getDefaultRouteNative(String interfaceName);
|
||||
|
||||
/** Remove host routes that uses the named interface. */
|
||||
public native static int removeHostRoutes(String interfaceName);
|
||||
|
||||
/** Remove the default route for the named interface. */
|
||||
public native static int removeDefaultRoute(String interfaceName);
|
||||
|
||||
/** Reset any sockets that are connected via the named interface. */
|
||||
public native static int resetConnections(String interfaceName);
|
||||
|
||||
|
|
@ -159,6 +133,15 @@ public class NetworkUtils {
|
|||
return Integer.reverseBytes(value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert a IPv4 netmask integer to a prefix length
|
||||
* @param netmask as an integer in network byte order
|
||||
* @return the network prefix length
|
||||
*/
|
||||
public static int netmaskIntToPrefixLength(int netmask) {
|
||||
return Integer.bitCount(netmask);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create an InetAddress from a string where the string must be a standard
|
||||
* representation of a V4 or V6 address. Avoids doing a DNS lookup on failure
|
||||
|
|
@ -172,60 +155,6 @@ public class NetworkUtils {
|
|||
return InetAddress.parseNumericAddress(addrString);
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a default route through the specified gateway.
|
||||
* @param interfaceName interface on which the route should be added
|
||||
* @param gw the IP address of the gateway to which the route is desired,
|
||||
* @return {@code true} on success, {@code false} on failure
|
||||
*/
|
||||
public static boolean addDefaultRoute(String interfaceName, InetAddress gw) {
|
||||
String dstStr;
|
||||
String gwStr = gw.getHostAddress();
|
||||
|
||||
if (gw instanceof Inet4Address) {
|
||||
dstStr = "0.0.0.0";
|
||||
} else if (gw instanceof Inet6Address) {
|
||||
dstStr = "::";
|
||||
} else {
|
||||
Log.w(TAG, "addDefaultRoute failure: address is neither IPv4 nor IPv6" +
|
||||
"(" + gwStr + ")");
|
||||
return false;
|
||||
}
|
||||
return addRoute(interfaceName, dstStr, 0, gwStr) == 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a host route.
|
||||
* @param interfaceName interface on which the route should be added
|
||||
* @param dst the IP address of the host to which the route is desired,
|
||||
* this should not be null.
|
||||
* @param gw the IP address of the gateway to which the route is desired,
|
||||
* if null, indicates a directly-connected route.
|
||||
* @return {@code true} on success, {@code false} on failure
|
||||
*/
|
||||
public static boolean addHostRoute(String interfaceName, InetAddress dst,
|
||||
InetAddress gw) {
|
||||
if (dst == null) {
|
||||
Log.w(TAG, "addHostRoute: dst should not be null");
|
||||
return false;
|
||||
}
|
||||
|
||||
int prefixLength;
|
||||
String dstStr = dst.getHostAddress();
|
||||
String gwStr = (gw != null) ? gw.getHostAddress() : null;
|
||||
|
||||
if (dst instanceof Inet4Address) {
|
||||
prefixLength = 32;
|
||||
} else if (dst instanceof Inet6Address) {
|
||||
prefixLength = 128;
|
||||
} else {
|
||||
Log.w(TAG, "addHostRoute failure: address is neither IPv4 nor IPv6" +
|
||||
"(" + dst + ")");
|
||||
return false;
|
||||
}
|
||||
return addRoute(interfaceName, dstStr, prefixLength, gwStr) == 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get InetAddress masked with prefixLength. Will never return null.
|
||||
* @param IP address which will be masked with specified prefixLength
|
||||
|
|
@ -271,4 +200,25 @@ public class NetworkUtils {
|
|||
return (((left instanceof Inet4Address) && (right instanceof Inet4Address)) ||
|
||||
((left instanceof Inet6Address) && (right instanceof Inet6Address)));
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert a 32 char hex string into a Inet6Address.
|
||||
* throws a runtime exception if the string isn't 32 chars, isn't hex or can't be
|
||||
* made into an Inet6Address
|
||||
* @param addrHexString a 32 character hex string representing an IPv6 addr
|
||||
* @return addr an InetAddress representation for the string
|
||||
*/
|
||||
public static InetAddress hexToInet6Address(String addrHexString)
|
||||
throws IllegalArgumentException {
|
||||
try {
|
||||
return numericToInetAddress(String.format("%s:%s:%s:%s:%s:%s:%s:%s",
|
||||
addrHexString.substring(0,4), addrHexString.substring(4,8),
|
||||
addrHexString.substring(8,12), addrHexString.substring(12,16),
|
||||
addrHexString.substring(16,20), addrHexString.substring(20,24),
|
||||
addrHexString.substring(24,28), addrHexString.substring(28,32)));
|
||||
} catch (Exception e) {
|
||||
Log.e("NetworkUtils", "error in hexToInet6Address(" + addrHexString + "): " + e);
|
||||
throw new IllegalArgumentException(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue