From eb61922007c4f41ef27216ff02661f741ba800ef Mon Sep 17 00:00:00 2001 From: Chiachang Wang Date: Wed, 3 Jul 2019 20:52:08 +0800 Subject: Add tests for IPv4-only private DNS servers Bug: 132670008 Test: atest NetworkStackTests:\ com.android.server.connectivity.NetworkMonitorTest Change-Id: Icaf526f7303dfc3085f7054cf06869c162fa9899 --- src/com/android/networkstack/util/DnsUtils.java | 3 +++ src/com/android/server/connectivity/NetworkMonitor.java | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/com/android/networkstack/util/DnsUtils.java b/src/com/android/networkstack/util/DnsUtils.java index 2ea5ed8..759807b 100644 --- a/src/com/android/networkstack/util/DnsUtils.java +++ b/src/com/android/networkstack/util/DnsUtils.java @@ -47,6 +47,9 @@ import java.util.concurrent.TimeoutException; public class DnsUtils { // Decide what queries to make depending on what IP addresses are on the system. public static final int TYPE_ADDRCONFIG = -1; + // A one time host name suffix of private dns probe. + // q.v. system/netd/server/dns/DnsTlsTransport.cpp + public static final String PRIVATE_DNS_PROBE_HOST_SUFFIX = "-dnsotls-ds.metric.gstatic.com"; private static final String TAG = DnsUtils.class.getSimpleName(); private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG); diff --git a/src/com/android/server/connectivity/NetworkMonitor.java b/src/com/android/server/connectivity/NetworkMonitor.java index d4b484d..6122d98 100644 --- a/src/com/android/server/connectivity/NetworkMonitor.java +++ b/src/com/android/server/connectivity/NetworkMonitor.java @@ -65,6 +65,7 @@ import static android.net.util.NetworkStackUtils.CAPTIVE_PORTAL_USE_HTTPS; import static android.net.util.NetworkStackUtils.NAMESPACE_CONNECTIVITY; import static android.net.util.NetworkStackUtils.isEmpty; +import static com.android.networkstack.util.DnsUtils.PRIVATE_DNS_PROBE_HOST_SUFFIX; import static com.android.networkstack.util.DnsUtils.TYPE_ADDRCONFIG; import android.annotation.NonNull; @@ -1083,10 +1084,8 @@ public class NetworkMonitor extends StateMachine { } private boolean sendPrivateDnsProbe() { - // q.v. system/netd/server/dns/DnsTlsTransport.cpp - final String oneTimeHostnameSuffix = "-dnsotls-ds.metric.gstatic.com"; final String host = UUID.randomUUID().toString().substring(0, 8) - + oneTimeHostnameSuffix; + + PRIVATE_DNS_PROBE_HOST_SUFFIX; final Stopwatch watch = new Stopwatch().start(); boolean success = false; long time; -- cgit v1.2.3