diff options
| author | Mike Yu <yumike@google.com> | 2019-09-23 17:47:21 +0800 |
|---|---|---|
| committer | Mike Yu <yumike@google.com> | 2019-10-09 21:44:33 +0800 |
| commit | a772c209875d2f6f02cfddc06eb7b97c573b6c2d (patch) | |
| tree | bf26dc64b738a3d7482d418d1bcb30f76ae9f615 /ResolverController.cpp | |
| parent | 0a423e4b35dacada4996cbf252a4f537feb1265a (diff) | |
Make private DNS connect timeout configurable
It could take time to connect to a private DNS server if the system
allows 6 syn-retransmissions (net.ipv4.tcp_syn_retries = 6), which
can take time more than 2 minutes.
This change allows us to configure the timeout value via dnsresolver
binder service, and keep the default timeout value the same as the
original design.
Bug: 120182528
Bug: 141218721
Test: atest --include-subdirs packages/modules/DnsResolver
Test: m com.android.resolv
adb install com.android.resolv
rebooted
Change-Id: I8711a31172cfc671bf348191db363e7863831470
Diffstat (limited to 'ResolverController.cpp')
| -rw-r--r-- | ResolverController.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ResolverController.cpp b/ResolverController.cpp index bdc65581..6927e5f4 100644 --- a/ResolverController.cpp +++ b/ResolverController.cpp @@ -210,9 +210,9 @@ int ResolverController::setResolverConfiguration(const ResolverParamsParcel& res if (tlsServers.size() > MAXNS) { tlsServers.resize(MAXNS); } - const int err = - gPrivateDnsConfiguration.set(resolverParams.netId, fwmark.intValue, tlsServers, - resolverParams.tlsName, resolverParams.caCertificate); + const int err = gPrivateDnsConfiguration.set( + resolverParams.netId, fwmark.intValue, tlsServers, resolverParams.tlsName, + resolverParams.caCertificate, resolverParams.tlsConnectTimeoutMs); if (err != 0) { return err; |