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

Merge "Make legacy VPN work over stacked interfaces."

Browse Source
This commit is contained in:
Lorenzo Colitti
2013-07-30 16:50:40 +00:00
committed by Gerrit Code Review
parent 158840079a bc8f82fb1f
commit 8fcad020e0
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/java/com/android/server/connectivity/Vpn.java
View File

@@ -467,15 +467,15 @@ public class Vpn extends BaseNetworkStateTracker {
private native int jniCheck(String interfaze); private native int jniCheck(String interfaze);
private native void jniProtect(int socket, String interfaze); private native void jniProtect(int socket, String interfaze);
private static String findLegacyVpnGateway(LinkProperties prop) { private static RouteInfo findIPv4DefaultRoute(LinkProperties prop) {
for (RouteInfo route : prop.getRoutes()) { for (RouteInfo route : prop.getAllRoutes()) {
// Currently legacy VPN only works on IPv4. // Currently legacy VPN only works on IPv4.
if (route.isDefaultRoute() && route.getGateway() instanceof Inet4Address) { if (route.isDefaultRoute() && route.getGateway() instanceof Inet4Address) {
return route.getGateway().getHostAddress(); return route;
} }
} }
throw new IllegalStateException("Unable to find suitable gateway"); throw new IllegalStateException("Unable to find IPv4 default gateway");
} }
/** /**
@@ -488,8 +488,9 @@ public class Vpn extends BaseNetworkStateTracker {
throw new IllegalStateException("KeyStore isn't unlocked"); throw new IllegalStateException("KeyStore isn't unlocked");
} }
final String iface = egress.getInterfaceName(); final RouteInfo ipv4DefaultRoute = findIPv4DefaultRoute(egress);
final String gateway = findLegacyVpnGateway(egress); final String gateway = ipv4DefaultRoute.getGateway().getHostAddress();
final String iface = ipv4DefaultRoute.getInterface();
// Load certificates. // Load certificates.
String privateKey = ""; String privateKey = "";