Commit c5048318 authored by Rob Percival's avatar Rob Percival Committed by Commit Bot

Remove edns0 from DnsConfig

This does not appear to be used by anything. When it was added in 2011,
there was some musing about using it but it seems it never was
(https://codereview.chromium.org/7518028/diff/12006/net/dns/dns_config_service_posix.cc#newcode52).

Bug: 831665
Change-Id: I1181594cb9f84ba406228075834c4fbfed42a21a
Reviewed-on: https://chromium-review.googlesource.com/1007664Reviewed-by: default avatarMatt Menke <mmenke@chromium.org>
Commit-Queue: Rob Percival <robpercival@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550571}
parent a714f9be
...@@ -24,7 +24,6 @@ DnsConfig::DnsConfig() ...@@ -24,7 +24,6 @@ DnsConfig::DnsConfig()
timeout(base::TimeDelta::FromMilliseconds(kDnsDefaultTimeoutMs)), timeout(base::TimeDelta::FromMilliseconds(kDnsDefaultTimeoutMs)),
attempts(2), attempts(2),
rotate(false), rotate(false),
edns0(false),
use_local_ipv6(false) {} use_local_ipv6(false) {}
DnsConfig::DnsConfig(const DnsConfig& other) = default; DnsConfig::DnsConfig(const DnsConfig& other) = default;
...@@ -44,7 +43,6 @@ bool DnsConfig::EqualsIgnoreHosts(const DnsConfig& d) const { ...@@ -44,7 +43,6 @@ bool DnsConfig::EqualsIgnoreHosts(const DnsConfig& d) const {
(timeout == d.timeout) && (timeout == d.timeout) &&
(attempts == d.attempts) && (attempts == d.attempts) &&
(rotate == d.rotate) && (rotate == d.rotate) &&
(edns0 == d.edns0) &&
(use_local_ipv6 == d.use_local_ipv6); (use_local_ipv6 == d.use_local_ipv6);
} }
...@@ -57,7 +55,6 @@ void DnsConfig::CopyIgnoreHosts(const DnsConfig& d) { ...@@ -57,7 +55,6 @@ void DnsConfig::CopyIgnoreHosts(const DnsConfig& d) {
timeout = d.timeout; timeout = d.timeout;
attempts = d.attempts; attempts = d.attempts;
rotate = d.rotate; rotate = d.rotate;
edns0 = d.edns0;
use_local_ipv6 = d.use_local_ipv6; use_local_ipv6 = d.use_local_ipv6;
} }
...@@ -80,7 +77,6 @@ std::unique_ptr<base::Value> DnsConfig::ToValue() const { ...@@ -80,7 +77,6 @@ std::unique_ptr<base::Value> DnsConfig::ToValue() const {
dict->SetDouble("timeout", timeout.InSecondsF()); dict->SetDouble("timeout", timeout.InSecondsF());
dict->SetInteger("attempts", attempts); dict->SetInteger("attempts", attempts);
dict->SetBoolean("rotate", rotate); dict->SetBoolean("rotate", rotate);
dict->SetBoolean("edns0", edns0);
dict->SetBoolean("use_local_ipv6", use_local_ipv6); dict->SetBoolean("use_local_ipv6", use_local_ipv6);
dict->SetInteger("num_hosts", hosts.size()); dict->SetInteger("num_hosts", hosts.size());
list = std::make_unique<base::ListValue>(); list = std::make_unique<base::ListValue>();
......
...@@ -88,8 +88,6 @@ struct NET_EXPORT_PRIVATE DnsConfig { ...@@ -88,8 +88,6 @@ struct NET_EXPORT_PRIVATE DnsConfig {
int attempts; int attempts;
// Round robin entries in |nameservers| for subsequent requests. // Round robin entries in |nameservers| for subsequent requests.
bool rotate; bool rotate;
// Enable EDNS0 extensions.
bool edns0;
// Indicates system configuration uses local IPv6 connectivity, e.g., // Indicates system configuration uses local IPv6 connectivity, e.g.,
// DirectAccess. This is exposed for HostResolver to skip IPv6 probes, // DirectAccess. This is exposed for HostResolver to skip IPv6 probes,
......
...@@ -562,9 +562,6 @@ ConfigParsePosixResult ConvertResStateToDnsConfig(const struct __res_state& res, ...@@ -562,9 +562,6 @@ ConfigParsePosixResult ConvertResStateToDnsConfig(const struct __res_state& res,
#if defined(RES_ROTATE) #if defined(RES_ROTATE)
dns_config->rotate = res.options & RES_ROTATE; dns_config->rotate = res.options & RES_ROTATE;
#endif #endif
#if defined(RES_USE_EDNS0)
dns_config->edns0 = res.options & RES_USE_EDNS0;
#endif
#if !defined(RES_USE_DNSSEC) #if !defined(RES_USE_DNSSEC)
// Some versions of libresolv don't have support for the DO bit. In this // Some versions of libresolv don't have support for the DO bit. In this
// case, we proceed without it. // case, we proceed without it.
......
...@@ -115,7 +115,6 @@ void InitializeExpectedConfig(DnsConfig* config) { ...@@ -115,7 +115,6 @@ void InitializeExpectedConfig(DnsConfig* config) {
config->timeout = base::TimeDelta::FromSeconds(4); config->timeout = base::TimeDelta::FromSeconds(4);
config->attempts = 7; config->attempts = 7;
config->rotate = true; config->rotate = true;
config->edns0 = false;
config->append_to_multi_label_name = true; config->append_to_multi_label_name = true;
config->search.clear(); config->search.clear();
config->search.push_back("chromium.org"); config->search.push_back("chromium.org");
......
...@@ -214,9 +214,6 @@ void FuzzedHostResolver::SetDnsClientEnabled(bool enabled) { ...@@ -214,9 +214,6 @@ void FuzzedHostResolver::SetDnsClientEnabled(bool enabled) {
config.rotate = data_provider_->ConsumeBool(); config.rotate = data_provider_->ConsumeBool();
// Doesn't currently seem to do anything.
config.edns0 = false;
config.use_local_ipv6 = data_provider_->ConsumeBool(); config.use_local_ipv6 = data_provider_->ConsumeBool();
std::unique_ptr<DnsClient> dns_client = DnsClient::CreateClientForTesting( std::unique_ptr<DnsClient> dns_client = DnsClient::CreateClientForTesting(
......
...@@ -87,8 +87,6 @@ std::string DnsConfigToString(const DnsConfig& dns_config) { ...@@ -87,8 +87,6 @@ std::string DnsConfigToString(const DnsConfig& dns_config) {
base::StringAppendF(&output, "options attempts:%d\n", dns_config.attempts); base::StringAppendF(&output, "options attempts:%d\n", dns_config.attempts);
if (dns_config.rotate) if (dns_config.rotate)
output.append("options rotate\n"); output.append("options rotate\n");
if (dns_config.edns0)
output.append("options edns0\n");
return output; return output;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment