DO NOT MERGE Sanitize WifiConfigs
Do this both on input from apps (giving error) and between wifi and ConnectivityService (ignoring bad data). This means removing all addresses beyond the first and all routes but the first default and the implied direct-connect routes. We do this because the user can't monitor the others (no UI), their support wasn't intended, they allow redirection of all traffic without user knowledge and they allow circumvention of legacy VPNs. This should not move forward from JB as it breaks IPv6 and K has a more resilient VPN. Bug:12663469 Change-Id: I0d92db7efc30a1bb3e5b8c6e5595bdb9793a16f2 Conflicts: core/java/android/net/LinkProperties.java services/java/com/android/server/WifiService.java wifi/java/android/net/wifi/WifiStateMachine.java
This commit is contained in:
@@ -144,6 +144,16 @@ public class LinkProperties implements Parcelable {
|
||||
return Collections.unmodifiableCollection(mLinkAddresses);
|
||||
}
|
||||
|
||||
/**
|
||||
* Replaces the LinkAddresses on this link with the given collection of addresses
|
||||
*/
|
||||
public void setLinkAddresses(Collection<LinkAddress> addresses) {
|
||||
mLinkAddresses.clear();
|
||||
for (LinkAddress address: addresses) {
|
||||
addLinkAddress(address);
|
||||
}
|
||||
}
|
||||
|
||||
public void addDns(InetAddress dns) {
|
||||
if (dns != null) mDnses.add(dns);
|
||||
}
|
||||
@@ -198,6 +208,16 @@ public class LinkProperties implements Parcelable {
|
||||
return routes;
|
||||
}
|
||||
|
||||
/**
|
||||
* Replaces the RouteInfos on this link with the given collection of RouteInfos.
|
||||
*/
|
||||
public void setRoutes(Collection<RouteInfo> routes) {
|
||||
mRoutes.clear();
|
||||
for (RouteInfo route : routes) {
|
||||
addRoute(route);
|
||||
}
|
||||
}
|
||||
|
||||
public void setHttpProxy(ProxyProperties proxy) {
|
||||
mHttpProxy = proxy;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user