commit dce6cbfab9ad5af7b03213f45fe75aa4dc5c0064
author Luke Huang <huangluke@google.com> Fri Aug 13 14:53:37 2021 +0800
committer Luke Huang <huangluke@google.com> Fri Aug 13 17:02:41 2021 +0800
tree f9dbad1347a9c64d60037512a2bb06bfad655eaa
parent 19c98df45b83eded0b65fdd2d044a5ff6d60369b

Enlarge the DoH query timeout and the server probe timeout

query timeout: from 2s to 30s
probe timeout: from 3s to 60s

Bug: 194048056
Test: atest
Change-Id: Ib11b17da7093b1d438ee8c7399694c2b19abeae9

PrivateDnsConfiguration.cpp

diff --git a/PrivateDnsConfiguration.cpp b/PrivateDnsConfiguration.cpp
index 8960460..75dd24f 100644
--- a/PrivateDnsConfiguration.cpp
+++ b/PrivateDnsConfiguration.cpp
@@ -462,8 +462,13 @@
         mPrivateDnsLog.push(std::move(record));
         LOG(INFO) << __func__ << ": Upgrading server to DoH: " << name;
 
+        int probeTimeout = Experiments::getInstance()->getFlag("doh_probe_timeout_ms",
+                                                               kDohProbeDefaultTimeoutMs);
+        if (probeTimeout < 1000) {
+            probeTimeout = 1000;
+        }
         return doh_net_new(mDohDispatcher, netId, dohId.httpsTemplate.c_str(), dohId.host.c_str(),
-                           dohId.ipAddr.c_str(), mark, caCert.c_str(), 3000);
+                           dohId.ipAddr.c_str(), mark, caCert.c_str(), probeTimeout);
     }
 
     LOG(INFO) << __func__ << ": No suitable DoH server found";