aboutsummaryrefslogtreecommitdiff
path: root/ResolverController.cpp
diff options
context:
space:
mode:
authorwaynema <waynema@google.com>2021-10-01 14:56:34 +0800
committerwaynema <waynema@google.com>2021-10-01 23:10:46 +0800
commitae5fe72c344017e4fecfef661ba4391dfde89e97 (patch)
treeaf22ad071d243baf07c6ab15d435e8c7737cf4fb /ResolverController.cpp
parent10eed9da6e8470205a517e732b010d4188e1173a (diff)
Cleanup DoH statistics when DoH is not supported in the private DNS mode.
Test steps: a. Default enable strict mode. b. Turn on WiFi and Mobile data. c. Swtich private DNS mode from strict mode to automatic mode. d. Expect to see DoH statistics only on WiFi. e. Switch private DNS mode from automatic mode to off mode. f. Expect to see no DoH statistics showing up on both WiFi and Mobile data. Tests will be done in a follow-up CL. Bug: 201735918 Test: Check output in dumpsys dnsresolver Change-Id: Ie4e67c3967778ada480cb2b5f9222cde5d2c705e
Diffstat (limited to 'ResolverController.cpp')
-rw-r--r--ResolverController.cpp17
1 files changed, 4 insertions, 13 deletions
diff --git a/ResolverController.cpp b/ResolverController.cpp
index b84b56ff..e81faa08 100644
--- a/ResolverController.cpp
+++ b/ResolverController.cpp
@@ -228,21 +228,12 @@ int ResolverController::setResolverConfiguration(const ResolverParamsParcel& res
}
if (isDoHEnabled()) {
- if (err = privateDnsConfiguration.setDoh(resolverParams.netId, netcontext.app_mark,
- tlsServers, resolverParams.tlsName,
- resolverParams.caCertificate);
- err != 0) {
+ err = privateDnsConfiguration.setDoh(resolverParams.netId, netcontext.app_mark, tlsServers,
+ resolverParams.tlsName, resolverParams.caCertificate);
+
+ if (err != 0) {
return err;
}
- auto result = privateDnsConfiguration.getDohServer(resolverParams.netId);
- if (result.ok()) {
- const netdutils::IPSockAddr sockAddr = result.value();
- if (err = resolv_stats_set_addrs(resolverParams.netId, PROTO_DOH,
- {sockAddr.ip().toString()}, sockAddr.port());
- err != 0) {
- return err;
- }
- }
}
res_params res_params = {};