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

Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev

Browse Source
This commit is contained in:
Lorenzo Colitti
2015-01-23 05:57:37 +00:00
committed by Android (Google) Code Review
parent b443610bcb b205311456
commit 78d51c2292
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/VpnService.java
View File

@@ -501,7 +501,7 @@ public class VpnService extends Service {
} }
} }
} }
mRoutes.add(new RouteInfo(new LinkAddress(address, prefixLength), null)); mRoutes.add(new RouteInfo(new IpPrefix(address, prefixLength), null));
mConfig.updateAllowedFamilies(address); mConfig.updateAllowedFamilies(address);
return this; return this;
} }

9
core/java/com/android/internal/net/VpnConfig.java
View File

@@ -24,6 +24,7 @@ import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.ResolveInfo; import android.content.pm.ResolveInfo;
import android.content.res.Resources; import android.content.res.Resources;
import android.net.IpPrefix;
import android.net.LinkAddress; import android.net.LinkAddress;
import android.net.Network; import android.net.Network;
import android.net.RouteInfo; import android.net.RouteInfo;
@@ -117,9 +118,7 @@ public class VpnConfig implements Parcelable {
String[] routes = routesStr.trim().split(" "); String[] routes = routesStr.trim().split(" ");
for (String route : routes) { for (String route : routes) {
//each route is ip/prefix //each route is ip/prefix
String[] split = route.split("/"); RouteInfo info = new RouteInfo(new IpPrefix(route), null);
RouteInfo info = new RouteInfo(new LinkAddress
(InetAddress.parseNumericAddress(split[0]), Integer.parseInt(split[1])), null);
this.routes.add(info); this.routes.add(info);
updateAllowedFamilies(info.getDestination().getAddress()); updateAllowedFamilies(info.getDestination().getAddress());
} }
@@ -132,9 +131,7 @@ public class VpnConfig implements Parcelable {
String[] addresses = addressesStr.trim().split(" "); String[] addresses = addressesStr.trim().split(" ");
for (String address : addresses) { for (String address : addresses) {
//each address is ip/prefix //each address is ip/prefix
String[] split = address.split("/"); LinkAddress addr = new LinkAddress(address);
LinkAddress addr = new LinkAddress(InetAddress.parseNumericAddress(split[0]),
Integer.parseInt(split[1]));
this.addresses.add(addr); this.addresses.add(addr);
updateAllowedFamilies(addr.getAddress()); updateAllowedFamilies(addr.getAddress());
} }