From 2129034e25f56f9b282a6c34780f48ba70b1bb68 Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Fri, 19 Sep 2014 01:49:05 +0900 Subject: [PATCH] Support non-unicast route types: unreachable and throw. Bug: 17462989 Change-Id: I8635472ca3e96ec2866af2de48e6260ab2da13fb --- core/java/android/net/IpPrefix.java | 2 +- core/java/android/net/LinkProperties.java | 3 +- core/java/android/net/RouteInfo.java | 93 +++++++++++++++++++++-- 3 files changed, 88 insertions(+), 10 deletions(-) diff --git a/core/java/android/net/IpPrefix.java b/core/java/android/net/IpPrefix.java index f1fa3eb748..b268986775 100644 --- a/core/java/android/net/IpPrefix.java +++ b/core/java/android/net/IpPrefix.java @@ -172,7 +172,7 @@ public final class IpPrefix implements Parcelable { /** * Returns a string representation of this {@code IpPrefix}. * - * @return a string such as {@code "192.0.2.0/24"} or {@code "2001:db8:1:2::"}. + * @return a string such as {@code "192.0.2.0/24"} or {@code "2001:db8:1:2::/64"}. */ public String toString() { try { diff --git a/core/java/android/net/LinkProperties.java b/core/java/android/net/LinkProperties.java index 3d6a132904..662c57627f 100644 --- a/core/java/android/net/LinkProperties.java +++ b/core/java/android/net/LinkProperties.java @@ -381,7 +381,8 @@ public final class LinkProperties implements Parcelable { return new RouteInfo( route.getDestination(), route.getGateway(), - mIfaceName); + mIfaceName, + route.getType()); } /** diff --git a/core/java/android/net/RouteInfo.java b/core/java/android/net/RouteInfo.java index a4ec80c9a5..cfd20a047e 100644 --- a/core/java/android/net/RouteInfo.java +++ b/core/java/android/net/RouteInfo.java @@ -62,6 +62,23 @@ public final class RouteInfo implements Parcelable { */ private final String mInterface; + + /** Unicast route. @hide */ + public static final int RTN_UNICAST = 1; + + /** Unreachable route. @hide */ + public static final int RTN_UNREACHABLE = 7; + + /** Throw route. @hide */ + public static final int RTN_THROW = 9; + + /** + * The type of this route; one of the RTN_xxx constants above. + */ + private final int mType; + + // Derived data members. + // TODO: remove these. private final boolean mIsHost; private final boolean mHasGateway; @@ -82,7 +99,26 @@ public final class RouteInfo implements Parcelable { * * @hide */ - public RouteInfo(IpPrefix destination, InetAddress gateway, String iface) { + public RouteInfo(IpPrefix destination, InetAddress gateway, String iface, int type) { + switch (type) { + case RTN_UNICAST: + case RTN_UNREACHABLE: + case RTN_THROW: + // TODO: It would be nice to ensure that route types that don't have nexthops or + // interfaces, such as unreachable or throw, can't be created if an interface or + // a gateway is specified. This is a bit too complicated to do at the moment + // because: + // + // - LinkProperties sets the interface on routes added to it, and modifies the + // interfaces of all the routes when its interface name changes. + // - Even when the gateway is null, we store a non-null gateway here. + // + // For now, we just rely on the code that sets routes to do things properly. + break; + default: + throw new IllegalArgumentException("Unknown route type " + type); + } + if (destination == null) { if (gateway != null) { if (gateway instanceof Inet4Address) { @@ -117,9 +153,17 @@ public final class RouteInfo implements Parcelable { mDestination = destination; // IpPrefix objects are immutable. mGateway = gateway; // InetAddress objects are immutable. mInterface = iface; // Strings are immutable. + mType = type; mIsHost = isHost(); } + /** + * @hide + */ + public RouteInfo(IpPrefix destination, InetAddress gateway, String iface) { + this(destination, gateway, iface, RTN_UNICAST); + } + /** * @hide */ @@ -150,6 +194,8 @@ public final class RouteInfo implements Parcelable { /** * @hide + * + * TODO: Remove this. */ public RouteInfo(LinkAddress destination, InetAddress gateway) { this(destination, gateway, null); @@ -185,6 +231,13 @@ public final class RouteInfo implements Parcelable { this(destination, null, null); } + /** + * @hide + */ + public RouteInfo(IpPrefix destination, int type) { + this(destination, null, null, type); + } + /** * @hide */ @@ -248,13 +301,24 @@ public final class RouteInfo implements Parcelable { return mInterface; } + /** + * Retrieves the type of this route. + * + * @return The type of this route; one of the {@code RTN_xxx} constants defined in this class. + * + * @hide + */ + public int getType() { + return mType; + } + /** * Indicates if this route is a default route (ie, has no destination specified). * * @return {@code true} if the destination has a prefix length of 0. */ public boolean isDefaultRoute() { - return mDestination.getPrefixLength() == 0; + return mType == RTN_UNICAST && mDestination.getPrefixLength() == 0; } /** @@ -345,9 +409,18 @@ public final class RouteInfo implements Parcelable { public String toString() { String val = ""; if (mDestination != null) val = mDestination.toString(); - val += " ->"; - if (mGateway != null) val += " " + mGateway.getHostAddress(); - if (mInterface != null) val += " " + mInterface; + if (mType == RTN_UNREACHABLE) { + val += " unreachable"; + } else if (mType == RTN_THROW) { + val += " throw"; + } else { + val += " ->"; + if (mGateway != null) val += " " + mGateway.getHostAddress(); + if (mInterface != null) val += " " + mInterface; + if (mType != RTN_UNICAST) { + val += " unknown type " + mType; + } + } return val; } @@ -364,7 +437,8 @@ public final class RouteInfo implements Parcelable { return Objects.equals(mDestination, target.getDestination()) && Objects.equals(mGateway, target.getGateway()) && - Objects.equals(mInterface, target.getInterface()); + Objects.equals(mInterface, target.getInterface()) && + mType == target.getType(); } /** @@ -373,7 +447,8 @@ public final class RouteInfo implements Parcelable { public int hashCode() { return (mDestination.hashCode() * 41) + (mGateway == null ? 0 :mGateway.hashCode() * 47) - + (mInterface == null ? 0 :mInterface.hashCode() * 67); + + (mInterface == null ? 0 :mInterface.hashCode() * 67) + + (mType * 71); } /** @@ -391,6 +466,7 @@ public final class RouteInfo implements Parcelable { byte[] gatewayBytes = (mGateway == null) ? null : mGateway.getAddress(); dest.writeByteArray(gatewayBytes); dest.writeString(mInterface); + dest.writeInt(mType); } /** @@ -408,8 +484,9 @@ public final class RouteInfo implements Parcelable { } catch (UnknownHostException e) {} String iface = in.readString(); + int type = in.readInt(); - return new RouteInfo(dest, gateway, iface); + return new RouteInfo(dest, gateway, iface, type); } public RouteInfo[] newArray(int size) {