Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Always specify an interface for host routes." into jb-mr2-dev

Browse Source
This commit is contained in:
Lorenzo Colitti
2013-03-11 17:22:25 +00:00
committed by Android (Google) Code Review
parent 1dc2ff66af e167135976
commit de96589113
3 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,17 +117,17 @@ public class RouteInfo implements Parcelable {
this(host, null, null);
}
public static RouteInfo makeHostRoute(InetAddress host) {
return makeHostRoute(host, null);
public static RouteInfo makeHostRoute(InetAddress host, String iface) {
return makeHostRoute(host, null, iface);
}
public static RouteInfo makeHostRoute(InetAddress host, InetAddress gateway) {
public static RouteInfo makeHostRoute(InetAddress host, InetAddress gateway, String iface) {
if (host == null) return null;
if (host instanceof Inet4Address) {
return new RouteInfo(new LinkAddress(host, 32), gateway);
return new RouteInfo(new LinkAddress(host, 32), gateway, iface);
} else {
return new RouteInfo(new LinkAddress(host, 128), gateway);
return new RouteInfo(new LinkAddress(host, 128), gateway, iface);
}
}