blob: ab69383555edee4996afc5de6d3991ebff2320e6 [file] [log] [blame]
Mattias Falk89c1e972011-04-29 14:48:51 +02001/*
2 * Copyright (C) 2011 The Android Open Source Project
3 *
4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License.
6 * You may obtain a copy of the License at
7 *
8 * http://www.apache.org/licenses/LICENSE-2.0
9 *
10 * Unless required by applicable law or agreed to in writing, software
11 * distributed under the License is distributed on an "AS IS" BASIS,
12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 * See the License for the specific language governing permissions and
14 * limitations under the License.
15 */
16
17#define LOG_TAG "ResolverController"
18#define DBG 0
19
Pierre Imaibeedec32016-04-13 06:44:51 +090020#include <algorithm>
21#include <cstdlib>
Ben Schwartze7601812017-04-28 16:38:29 -040022#include <map>
23#include <mutex>
24#include <set>
Pierre Imaibeedec32016-04-13 06:44:51 +090025#include <string>
Ben Schwartze7601812017-04-28 16:38:29 -040026#include <thread>
27#include <utility>
Pierre Imaibeedec32016-04-13 06:44:51 +090028#include <vector>
Mattias Falk89c1e972011-04-29 14:48:51 +020029#include <cutils/log.h>
Elliott Hughes970274a2012-09-11 18:56:36 -070030#include <net/if.h>
Pierre Imaibeedec32016-04-13 06:44:51 +090031#include <sys/socket.h>
32#include <netdb.h>
David 'Digit' Turner4da10dd2012-01-13 13:43:43 +010033
Ben Schwartze7601812017-04-28 16:38:29 -040034#include <arpa/inet.h>
Szymon Jakubczaka0efaec2014-02-14 17:09:43 -050035// NOTE: <resolv_netid.h> is a private C library header that provides
36// declarations for _resolv_set_nameservers_for_net and
37// _resolv_flush_cache_for_net
38#include <resolv_netid.h>
Pierre Imai95f5f942016-03-09 18:09:25 +090039#include <resolv_params.h>
Pierre Imaibeedec32016-04-13 06:44:51 +090040#include <resolv_stats.h>
41
Pierre Imai3a272072016-04-19 16:17:07 +090042#include <android-base/strings.h>
Ben Schwartzcbdd64a2017-08-23 18:21:46 -040043#include <android-base/thread_annotations.h>
Pierre Imaibeedec32016-04-13 06:44:51 +090044#include <android/net/INetd.h>
Mattias Falk89c1e972011-04-29 14:48:51 +020045
Pierre Imai3a272072016-04-19 16:17:07 +090046#include "DumpWriter.h"
Ben Schwartze7601812017-04-28 16:38:29 -040047#include "NetdConstants.h"
Mattias Falk89c1e972011-04-29 14:48:51 +020048#include "ResolverController.h"
Pierre Imaibeedec32016-04-13 06:44:51 +090049#include "ResolverStats.h"
Ben Schwartze7601812017-04-28 16:38:29 -040050#include "dns/DnsTlsTransport.h"
Mattias Falk89c1e972011-04-29 14:48:51 +020051
Lorenzo Colitti7035f222017-02-13 18:29:00 +090052namespace android {
53namespace net {
54
Ben Schwartze7601812017-04-28 16:38:29 -040055namespace {
56
Ben Schwartze7601812017-04-28 16:38:29 -040057// This comparison ignores ports and fingerprints.
Ben Schwartz52504622017-07-11 12:21:13 -040058struct AddressComparator {
59 bool operator() (const DnsTlsTransport::Server& x, const DnsTlsTransport::Server& y) const {
60 if (x.ss.ss_family != y.ss.ss_family) {
61 return x.ss.ss_family < y.ss.ss_family;
62 }
63 // Same address family. Compare IP addresses.
64 if (x.ss.ss_family == AF_INET) {
65 const sockaddr_in& x_sin = reinterpret_cast<const sockaddr_in&>(x.ss);
66 const sockaddr_in& y_sin = reinterpret_cast<const sockaddr_in&>(y.ss);
67 return x_sin.sin_addr.s_addr < y_sin.sin_addr.s_addr;
68 } else if (x.ss.ss_family == AF_INET6) {
69 const sockaddr_in6& x_sin6 = reinterpret_cast<const sockaddr_in6&>(x.ss);
70 const sockaddr_in6& y_sin6 = reinterpret_cast<const sockaddr_in6&>(y.ss);
71 return std::memcmp(x_sin6.sin6_addr.s6_addr, y_sin6.sin6_addr.s6_addr, 16) < 0;
72 }
73 return false; // Unknown address type. This is an error.
Ben Schwartze7601812017-04-28 16:38:29 -040074 }
Ben Schwartz52504622017-07-11 12:21:13 -040075};
Ben Schwartze7601812017-04-28 16:38:29 -040076
77bool parseServer(const char* server, in_port_t port, sockaddr_storage* parsed) {
78 sockaddr_in* sin = reinterpret_cast<sockaddr_in*>(parsed);
79 if (inet_pton(AF_INET, server, &(sin->sin_addr)) == 1) {
80 // IPv4 parse succeeded, so it's IPv4
81 sin->sin_family = AF_INET;
82 sin->sin_port = htons(port);
83 return true;
84 }
85 sockaddr_in6* sin6 = reinterpret_cast<sockaddr_in6*>(parsed);
86 if (inet_pton(AF_INET6, server, &(sin6->sin6_addr)) == 1){
87 // IPv6 parse succeeded, so it's IPv6.
88 sin6->sin6_family = AF_INET6;
89 sin6->sin6_port = htons(port);
90 return true;
91 }
92 if (DBG) {
93 ALOGW("Failed to parse server address: %s", server);
94 }
95 return false;
96}
97
98// Structure for tracking the entire set of known Private DNS servers.
99std::mutex privateDnsLock;
Ben Schwartz52504622017-07-11 12:21:13 -0400100typedef std::set<DnsTlsTransport::Server, AddressComparator> PrivateDnsSet;
Ben Schwartzcbdd64a2017-08-23 18:21:46 -0400101PrivateDnsSet privateDnsServers GUARDED_BY(privateDnsLock);
Ben Schwartze7601812017-04-28 16:38:29 -0400102
103// Structure for tracking the validation status of servers on a specific netid.
104// Servers that fail validation are removed from the tracker, and can be retried.
105enum class Validation : bool { in_process, success };
Ben Schwartz52504622017-07-11 12:21:13 -0400106typedef std::map<DnsTlsTransport::Server, Validation, AddressComparator> PrivateDnsTracker;
Ben Schwartzcbdd64a2017-08-23 18:21:46 -0400107std::map<unsigned, PrivateDnsTracker> privateDnsTransports GUARDED_BY(privateDnsLock);
Ben Schwartze7601812017-04-28 16:38:29 -0400108
109PrivateDnsSet parseServers(const char** servers, int numservers, in_port_t port) {
110 PrivateDnsSet set;
111 for (int i = 0; i < numservers; ++i) {
112 sockaddr_storage parsed;
113 if (parseServer(servers[i], port, &parsed)) {
114 set.insert(parsed);
115 }
116 }
117 return set;
118}
119
120void checkPrivateDnsProviders(const unsigned netId, const char** servers, int numservers) {
121 if (DBG) {
122 ALOGD("checkPrivateDnsProviders(%u)", netId);
123 }
124
125 std::lock_guard<std::mutex> guard(privateDnsLock);
126 if (privateDnsServers.empty()) {
127 return;
128 }
129
130 // First compute the intersection of the servers to check with the
131 // servers that are permitted to use DNS over TLS. The intersection
132 // will contain the port number to be used for Private DNS.
133 PrivateDnsSet serversToCheck = parseServers(servers, numservers, 53);
134 PrivateDnsSet intersection;
135 std::set_intersection(privateDnsServers.begin(), privateDnsServers.end(),
136 serversToCheck.begin(), serversToCheck.end(),
Ben Schwartz52504622017-07-11 12:21:13 -0400137 std::inserter(intersection, intersection.begin()),
138 AddressComparator());
Ben Schwartze7601812017-04-28 16:38:29 -0400139 if (intersection.empty()) {
140 return;
141 }
142
143 auto netPair = privateDnsTransports.find(netId);
144 if (netPair == privateDnsTransports.end()) {
145 // New netId
146 bool added;
147 std::tie(netPair, added) = privateDnsTransports.emplace(netId, PrivateDnsTracker());
148 if (!added) {
149 ALOGE("Memory error while checking private DNS for netId %d", netId);
150 return;
151 }
152 }
153
154 auto& tracker = netPair->second;
155 for (const auto& privateServer : intersection) {
156 if (tracker.count(privateServer) != 0) {
157 continue;
158 }
159 tracker[privateServer] = Validation::in_process;
160 std::thread validate_thread([privateServer, netId] {
Ben Schwartz52504622017-07-11 12:21:13 -0400161 // ::validate() is a blocking call that performs network operations.
Ben Schwartze7601812017-04-28 16:38:29 -0400162 // It can take milliseconds to minutes, up to the SYN retry limit.
Ben Schwartz52504622017-07-11 12:21:13 -0400163 bool success = DnsTlsTransport::validate(privateServer, netId);
Ben Schwartze7601812017-04-28 16:38:29 -0400164 std::lock_guard<std::mutex> guard(privateDnsLock);
165 auto netPair = privateDnsTransports.find(netId);
166 if (netPair == privateDnsTransports.end()) {
167 ALOGW("netId %u was erased during private DNS validation", netId);
168 return;
169 }
170 auto& tracker = netPair->second;
171 if (privateDnsServers.count(privateServer) == 0) {
172 ALOGW("Server was removed during private DNS validation");
173 success = false;
174 }
175 if (success) {
176 tracker[privateServer] = Validation::success;
177 } else {
178 // Validation failure is expected if a user is on a captive portal.
179 // TODO: Trigger a second validation attempt after captive portal login
180 // succeeds.
181 tracker.erase(privateServer);
182 }
183 });
184 validate_thread.detach();
185 }
186}
187
188void clearPrivateDnsProviders(unsigned netId) {
189 if (DBG) {
190 ALOGD("clearPrivateDnsProviders(%u)", netId);
191 }
192 std::lock_guard<std::mutex> guard(privateDnsLock);
193 privateDnsTransports.erase(netId);
194}
195
196} // namespace
197
Pierre Imai95f5f942016-03-09 18:09:25 +0900198int ResolverController::setDnsServers(unsigned netId, const char* searchDomains,
199 const char** servers, int numservers, const __res_params* params) {
Mattias Falk89c1e972011-04-29 14:48:51 +0200200 if (DBG) {
Szymon Jakubczaka0efaec2014-02-14 17:09:43 -0500201 ALOGD("setDnsServers netId = %u\n", netId);
Mattias Falk89c1e972011-04-29 14:48:51 +0200202 }
Ben Schwartze7601812017-04-28 16:38:29 -0400203 checkPrivateDnsProviders(netId, servers, numservers);
Pierre Imaibeedec32016-04-13 06:44:51 +0900204 return -_resolv_set_nameservers_for_net(netId, servers, numservers, searchDomains, params);
Mattias Falk89c1e972011-04-29 14:48:51 +0200205}
Paul Jensen6a46f332014-08-06 18:42:27 +0000206
Ben Schwartze7601812017-04-28 16:38:29 -0400207bool ResolverController::shouldUseTls(unsigned netId, const sockaddr_storage& insecureServer,
Ben Schwartz52504622017-07-11 12:21:13 -0400208 DnsTlsTransport::Server* secureServer) {
Ben Schwartze7601812017-04-28 16:38:29 -0400209 // This mutex is on the critical path of every DNS lookup that doesn't hit a local cache.
210 // If the overhead of mutex acquisition proves too high, we could reduce it by maintaining
211 // an atomic_int32_t counter of validated connections, and returning early if it's zero.
212 std::lock_guard<std::mutex> guard(privateDnsLock);
213 const auto netPair = privateDnsTransports.find(netId);
214 if (netPair == privateDnsTransports.end()) {
215 return false;
216 }
217 const auto& tracker = netPair->second;
218 const auto serverPair = tracker.find(insecureServer);
219 if (serverPair == tracker.end() || serverPair->second != Validation::success) {
220 return false;
221 }
222 const auto& validatedServer = serverPair->first;
Ben Schwartz52504622017-07-11 12:21:13 -0400223 *secureServer = validatedServer;
Ben Schwartze7601812017-04-28 16:38:29 -0400224 return true;
225}
226
Lorenzo Colittidadc5f82014-11-29 13:54:25 +0900227int ResolverController::clearDnsServers(unsigned netId) {
Pierre Imai95f5f942016-03-09 18:09:25 +0900228 _resolv_set_nameservers_for_net(netId, NULL, 0, "", NULL);
Lorenzo Colittidadc5f82014-11-29 13:54:25 +0900229 if (DBG) {
230 ALOGD("clearDnsServers netId = %u\n", netId);
231 }
Ben Schwartze7601812017-04-28 16:38:29 -0400232 clearPrivateDnsProviders(netId);
Lorenzo Colittidadc5f82014-11-29 13:54:25 +0900233 return 0;
234}
235
Paul Jensen6a46f332014-08-06 18:42:27 +0000236int ResolverController::flushDnsCache(unsigned netId) {
237 if (DBG) {
238 ALOGD("flushDnsCache netId = %u\n", netId);
239 }
240
241 _resolv_flush_cache_for_net(netId);
242
243 return 0;
244}
Pierre Imaibeedec32016-04-13 06:44:51 +0900245
246int ResolverController::getDnsInfo(unsigned netId, std::vector<std::string>* servers,
247 std::vector<std::string>* domains, __res_params* params,
248 std::vector<android::net::ResolverStats>* stats) {
249 using android::net::ResolverStats;
250 using android::net::INetd;
251 static_assert(ResolverStats::STATS_SUCCESSES == INetd::RESOLVER_STATS_SUCCESSES &&
252 ResolverStats::STATS_ERRORS == INetd::RESOLVER_STATS_ERRORS &&
253 ResolverStats::STATS_TIMEOUTS == INetd::RESOLVER_STATS_TIMEOUTS &&
254 ResolverStats::STATS_INTERNAL_ERRORS == INetd::RESOLVER_STATS_INTERNAL_ERRORS &&
255 ResolverStats::STATS_RTT_AVG == INetd::RESOLVER_STATS_RTT_AVG &&
256 ResolverStats::STATS_LAST_SAMPLE_TIME == INetd::RESOLVER_STATS_LAST_SAMPLE_TIME &&
257 ResolverStats::STATS_USABLE == INetd::RESOLVER_STATS_USABLE &&
258 ResolverStats::STATS_COUNT == INetd::RESOLVER_STATS_COUNT,
259 "AIDL and ResolverStats.h out of sync");
260 int nscount = -1;
261 sockaddr_storage res_servers[MAXNS];
262 int dcount = -1;
263 char res_domains[MAXDNSRCH][MAXDNSRCHPATH];
264 __res_stats res_stats[MAXNS];
265 servers->clear();
266 domains->clear();
267 *params = __res_params{};
268 stats->clear();
269 int revision_id = android_net_res_stats_get_info_for_net(netId, &nscount, res_servers, &dcount,
270 res_domains, params, res_stats);
271
272 // If the netId is unknown (which can happen for valid net IDs for which no DNS servers have
273 // yet been configured), there is no revision ID. In this case there is no data to return.
274 if (revision_id < 0) {
275 return 0;
276 }
277
278 // Verify that the returned data is sane.
279 if (nscount < 0 || nscount > MAXNS || dcount < 0 || dcount > MAXDNSRCH) {
280 ALOGE("%s: nscount=%d, dcount=%d", __FUNCTION__, nscount, dcount);
281 return -ENOTRECOVERABLE;
282 }
283
284 // Determine which servers are considered usable by the resolver.
285 bool valid_servers[MAXNS];
286 std::fill_n(valid_servers, MAXNS, false);
287 android_net_res_stats_get_usable_servers(params, res_stats, nscount, valid_servers);
288
289 // Convert the server sockaddr structures to std::string.
290 stats->resize(nscount);
291 for (int i = 0 ; i < nscount ; ++i) {
292 char hbuf[NI_MAXHOST];
293 int rv = getnameinfo(reinterpret_cast<const sockaddr*>(&res_servers[i]),
294 sizeof(res_servers[i]), hbuf, sizeof(hbuf), nullptr, 0, NI_NUMERICHOST);
295 std::string server_str;
296 if (rv == 0) {
297 server_str.assign(hbuf);
298 } else {
299 ALOGE("getnameinfo() failed for server #%d: %s", i, gai_strerror(rv));
300 server_str.assign("<invalid>");
301 }
302 servers->push_back(std::move(server_str));
303 android::net::ResolverStats& cur_stats = (*stats)[i];
304 android_net_res_stats_aggregate(&res_stats[i], &cur_stats.successes, &cur_stats.errors,
305 &cur_stats.timeouts, &cur_stats.internal_errors, &cur_stats.rtt_avg,
306 &cur_stats.last_sample_time);
307 cur_stats.usable = valid_servers[i];
308 }
309
310 // Convert the stack-allocated search domain strings to std::string.
311 for (int i = 0 ; i < dcount ; ++i) {
312 domains->push_back(res_domains[i]);
313 }
314 return 0;
315}
316
317int ResolverController::setResolverConfiguration(int32_t netId,
318 const std::vector<std::string>& servers, const std::vector<std::string>& domains,
319 const std::vector<int32_t>& params) {
320 using android::net::INetd;
321 if (params.size() != INetd::RESOLVER_PARAMS_COUNT) {
322 ALOGE("%s: params.size()=%zu", __FUNCTION__, params.size());
323 return -EINVAL;
324 }
325
Pierre Imai0452cb52016-05-30 16:42:34 +0900326 auto server_count = std::min<size_t>(MAXNS, servers.size());
Pierre Imaibeedec32016-04-13 06:44:51 +0900327 std::vector<const char*> server_ptrs;
Pierre Imai0452cb52016-05-30 16:42:34 +0900328 for (size_t i = 0 ; i < server_count ; ++i) {
329 server_ptrs.push_back(servers[i].c_str());
Pierre Imaibeedec32016-04-13 06:44:51 +0900330 }
331
332 std::string domains_str;
333 if (!domains.empty()) {
334 domains_str = domains[0];
335 for (size_t i = 1 ; i < domains.size() ; ++i) {
336 domains_str += " " + domains[i];
337 }
338 }
339
340 __res_params res_params;
341 res_params.sample_validity = params[INetd::RESOLVER_PARAMS_SAMPLE_VALIDITY];
342 res_params.success_threshold = params[INetd::RESOLVER_PARAMS_SUCCESS_THRESHOLD];
343 res_params.min_samples = params[INetd::RESOLVER_PARAMS_MIN_SAMPLES];
344 res_params.max_samples = params[INetd::RESOLVER_PARAMS_MAX_SAMPLES];
345
346 return setDnsServers(netId, domains_str.c_str(), server_ptrs.data(), server_ptrs.size(),
347 &res_params);
348}
349
350int ResolverController::getResolverInfo(int32_t netId, std::vector<std::string>* servers,
351 std::vector<std::string>* domains, std::vector<int32_t>* params,
352 std::vector<int32_t>* stats) {
353 using android::net::ResolverStats;
354 using android::net::INetd;
355 __res_params res_params;
356 std::vector<ResolverStats> res_stats;
357 int ret = getDnsInfo(netId, servers, domains, &res_params, &res_stats);
358 if (ret != 0) {
359 return ret;
360 }
361
362 // Serialize the information for binder.
363 ResolverStats::encodeAll(res_stats, stats);
364
365 params->resize(INetd::RESOLVER_PARAMS_COUNT);
366 (*params)[INetd::RESOLVER_PARAMS_SAMPLE_VALIDITY] = res_params.sample_validity;
367 (*params)[INetd::RESOLVER_PARAMS_SUCCESS_THRESHOLD] = res_params.success_threshold;
368 (*params)[INetd::RESOLVER_PARAMS_MIN_SAMPLES] = res_params.min_samples;
369 (*params)[INetd::RESOLVER_PARAMS_MAX_SAMPLES] = res_params.max_samples;
370 return 0;
371}
Pierre Imai3a272072016-04-19 16:17:07 +0900372
373void ResolverController::dump(DumpWriter& dw, unsigned netId) {
374 // No lock needed since Bionic's resolver locks all accessed data structures internally.
375 using android::net::ResolverStats;
376 std::vector<std::string> servers;
377 std::vector<std::string> domains;
378 __res_params params;
379 std::vector<ResolverStats> stats;
380 time_t now = time(nullptr);
381 int rv = getDnsInfo(netId, &servers, &domains, &params, &stats);
382 dw.incIndent();
383 if (rv != 0) {
384 dw.println("getDnsInfo() failed for netid %u", netId);
385 } else {
386 if (servers.empty()) {
387 dw.println("No DNS servers defined");
388 } else {
389 dw.println("DNS servers: # IP (total, successes, errors, timeouts, internal errors, "
390 "RTT avg, last sample)");
391 dw.incIndent();
392 for (size_t i = 0 ; i < servers.size() ; ++i) {
393 if (i < stats.size()) {
394 const ResolverStats& s = stats[i];
395 int total = s.successes + s.errors + s.timeouts + s.internal_errors;
396 if (total > 0) {
397 int time_delta = (s.last_sample_time > 0) ? now - s.last_sample_time : -1;
398 dw.println("%s (%d, %d, %d, %d, %d, %dms, %ds)%s", servers[i].c_str(),
399 total, s.successes, s.errors, s.timeouts, s.internal_errors,
400 s.rtt_avg, time_delta, s.usable ? "" : " BROKEN");
401 } else {
402 dw.println("%s <no data>", servers[i].c_str());
403 }
404 } else {
405 dw.println("%s <no stats>", servers[i].c_str());
406 }
407 }
408 dw.decIndent();
409 }
410 if (domains.empty()) {
411 dw.println("No search domains defined");
412 } else {
413 std::string domains_str = android::base::Join(domains, ", ");
414 dw.println("search domains: %s", domains_str.c_str());
415 }
416 if (params.sample_validity != 0) {
417 dw.println("DNS parameters: sample validity = %us, success threshold = %u%%, "
418 "samples (min, max) = (%u, %u)", params.sample_validity,
419 static_cast<unsigned>(params.success_threshold),
420 static_cast<unsigned>(params.min_samples),
421 static_cast<unsigned>(params.max_samples));
422 }
423 }
424 dw.decIndent();
425}
Lorenzo Colitti7035f222017-02-13 18:29:00 +0900426
Ben Schwartze7601812017-04-28 16:38:29 -0400427int ResolverController::addPrivateDnsServer(const std::string& server, int32_t port,
Ben Schwartz1691bc42017-08-16 12:53:09 -0400428 const std::string& name,
Ben Schwartze7601812017-04-28 16:38:29 -0400429 const std::string& fingerprintAlgorithm,
430 const std::set<std::vector<uint8_t>>& fingerprints) {
431 using android::net::INetd;
432 if (fingerprintAlgorithm.empty()) {
433 if (!fingerprints.empty()) {
434 return INetd::PRIVATE_DNS_BAD_FINGERPRINT;
435 }
436 } else if (fingerprintAlgorithm.compare("SHA-256") == 0) {
437 if (fingerprints.empty()) {
438 return INetd::PRIVATE_DNS_BAD_FINGERPRINT;
439 }
440 for (const auto& fingerprint : fingerprints) {
441 if (fingerprint.size() != SHA256_SIZE) {
442 return INetd::PRIVATE_DNS_BAD_FINGERPRINT;
443 }
444 }
445 } else {
446 return INetd::PRIVATE_DNS_UNKNOWN_ALGORITHM;
447 }
448 if (port <= 0 || port > 0xFFFF) {
449 return INetd::PRIVATE_DNS_BAD_PORT;
450 }
451 sockaddr_storage parsed;
452 if (!parseServer(server.c_str(), port, &parsed)) {
453 return INetd::PRIVATE_DNS_BAD_ADDRESS;
454 }
Ben Schwartz52504622017-07-11 12:21:13 -0400455 DnsTlsTransport::Server privateServer(parsed);
Ben Schwartze7601812017-04-28 16:38:29 -0400456 privateServer.fingerprints = fingerprints;
Ben Schwartz1691bc42017-08-16 12:53:09 -0400457 privateServer.name = name;
Ben Schwartze7601812017-04-28 16:38:29 -0400458 std::lock_guard<std::mutex> guard(privateDnsLock);
459 // Ensure we overwrite any previous matching server. This is necessary because equality is
460 // based only on the IP address, not the port or fingerprints.
461 privateDnsServers.erase(privateServer);
462 privateDnsServers.insert(privateServer);
Ben Schwartz52504622017-07-11 12:21:13 -0400463 if (DBG) {
464 ALOGD("Recorded private DNS server: %s", server.c_str());
465 }
Ben Schwartze7601812017-04-28 16:38:29 -0400466 return INetd::PRIVATE_DNS_SUCCESS;
467}
468
469int ResolverController::removePrivateDnsServer(const std::string& server) {
470 using android::net::INetd;
471 sockaddr_storage parsed;
472 if (!parseServer(server.c_str(), 0, &parsed)) {
473 return INetd::PRIVATE_DNS_BAD_ADDRESS;
474 }
475 std::lock_guard<std::mutex> guard(privateDnsLock);
476 privateDnsServers.erase(parsed);
477 for (auto& pair : privateDnsTransports) {
478 pair.second.erase(parsed);
479 }
480 return INetd::PRIVATE_DNS_SUCCESS;
481}
482
Lorenzo Colitti7035f222017-02-13 18:29:00 +0900483} // namespace net
484} // namespace android