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

Add negotiated DNS servers to VPN config

Browse Source 
This change plumbs the DNS servers through from the
IkeSessionConfiguration. Previously the getInternalDnsServer() was not
implemented.

Bug: 152242520
Test: FrameworksNetTests passing
Change-Id: Icd80b3688de2a39e222a4501787f8c54951c2ba0
Merged-In: Icd80b3688de2a39e222a4501787f8c54951c2ba0
(cherry picked from commit bd2763d977)
This commit is contained in:
Benedict Wong
2020-03-23 13:56:36 -07:00
parent 9332d217af
commit 8b9538df8f
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -2248,12 +2248,16 @@ public class Vpn {
final String interfaceName = mTunnelIface.getInterfaceName(); final String interfaceName = mTunnelIface.getInterfaceName();
final int maxMtu = mProfile.getMaxMtu(); final int maxMtu = mProfile.getMaxMtu();
final List<LinkAddress> internalAddresses = childConfig.getInternalAddresses(); final List<LinkAddress> internalAddresses = childConfig.getInternalAddresses();
final List<String> dnsAddrStrings = new ArrayList<>();
final Collection<RouteInfo> newRoutes = VpnIkev2Utils.getRoutesFromTrafficSelectors( final Collection<RouteInfo> newRoutes = VpnIkev2Utils.getRoutesFromTrafficSelectors(
childConfig.getOutboundTrafficSelectors()); childConfig.getOutboundTrafficSelectors());
for (final LinkAddress address : internalAddresses) { for (final LinkAddress address : internalAddresses) {
mTunnelIface.addAddress(address.getAddress(), address.getPrefixLength()); mTunnelIface.addAddress(address.getAddress(), address.getPrefixLength());
} }
for (InetAddress addr : childConfig.getInternalDnsServers()) {
dnsAddrStrings.add(addr.getHostAddress());
}
final NetworkAgent networkAgent; final NetworkAgent networkAgent;
final LinkProperties lp; final LinkProperties lp;
@@ -2269,7 +2273,9 @@ public class Vpn {
mConfig.routes.clear(); mConfig.routes.clear();
mConfig.routes.addAll(newRoutes); mConfig.routes.addAll(newRoutes);
// TODO: Add DNS servers from negotiation if (mConfig.dnsServers == null) mConfig.dnsServers = new ArrayList<>();
mConfig.dnsServers.clear();
mConfig.dnsServers.addAll(dnsAddrStrings);
networkAgent = mNetworkAgent; networkAgent = mNetworkAgent;