[net/dns] Treat Name Resolution Policy Table as unhandled option.

net/dns/dns_config_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/dns/dns_config_service.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/values.h"
 #include "net/base/ip_endpoint.h"
 
 namespace net {
 
 // Default values are taken from glibc resolv.h except timeout which is set to
 // |kDnsTimeoutSeconds|.
 DnsConfig::DnsConfig()
     : unhandled_options(false),
       append_to_multi_label_name(true),
       randomize_ports(false),
       ndots(1),
       timeout(base::TimeDelta::FromSeconds(kDnsTimeoutSeconds)),
       attempts(2),
       rotate(false),
-      edns0(false) {}
+      edns0(false),
+      use_local_ipv6(false) {}
 
 DnsConfig::~DnsConfig() {}
 
 bool DnsConfig::Equals(const DnsConfig& d) const {
   return EqualsIgnoreHosts(d) && (hosts == d.hosts);
 }
 
 bool DnsConfig::EqualsIgnoreHosts(const DnsConfig& d) const {
   return (nameservers == d.nameservers) &&
          (search == d.search) &&
          (unhandled_options == d.unhandled_options) &&
          (append_to_multi_label_name == d.append_to_multi_label_name) &&
          (ndots == d.ndots) &&
          (timeout == d.timeout) &&
          (attempts == d.attempts) &&
          (rotate == d.rotate) &&
-         (edns0 == d.edns0);
+         (edns0 == d.edns0) &&
+         (use_local_ipv6 == d.use_local_ipv6);
 }
 
 void DnsConfig::CopyIgnoreHosts(const DnsConfig& d) {
   nameservers = d.nameservers;
   search = d.search;
   unhandled_options = d.unhandled_options;
   append_to_multi_label_name = d.append_to_multi_label_name;
   ndots = d.ndots;
   timeout = d.timeout;
   attempts = d.attempts;
   rotate = d.rotate;
   edns0 = d.edns0;
+  use_local_ipv6 = d.use_local_ipv6;
 }
 
 base::Value* DnsConfig::ToValue() const {
   base::DictionaryValue* dict = new base::DictionaryValue();
 
   base::ListValue* list = new base::ListValue();
   for (size_t i = 0; i < nameservers.size(); ++i)
     list->Append(new base::StringValue(nameservers[i].ToString()));
   dict->Set("nameservers", list);
 
   list = new base::ListValue();
   for (size_t i = 0; i < search.size(); ++i)
     list->Append(new base::StringValue(search[i]));
   dict->Set("search", list);
 
   dict->SetBoolean("unhandled_options", unhandled_options);
   dict->SetBoolean("append_to_multi_label_name", append_to_multi_label_name);
   dict->SetInteger("ndots", ndots);
   dict->SetDouble("timeout", timeout.InSecondsF());
   dict->SetInteger("attempts", attempts);
   dict->SetBoolean("rotate", rotate);
   dict->SetBoolean("edns0", edns0);
+  dict->SetBoolean("use_local_ipv6", use_local_ipv6);

[mmenke, 2013/09/16 16:34:46]

nit: Should update the DNS_CONFIG_CHANGED description in net_log_event_types.h. 
Maybe just replace the documentation with a pointer to DnsConfig in
dns_config_service.h? Not sure how much value there is in duplicated the
documentation in the two files.  Does make it a little easier to look events in
general, but how often do people do that?

[szym, 2013/09/16 19:17:35]

I replaced the primitives with

<other>: <See DnsConfig>

This breaks the convention in net_log_event_types.h. Let me know if it's ok.

   dict->SetInteger("num_hosts", hosts.size());
 
   return dict;
 }
 
 
 DnsConfigService::DnsConfigService()
     : watch_failed_(false),
       have_config_(false),
       have_hosts_(false),
@@ skipping 135 matching lines @@
   if (watch_failed_) {
     // If a watch failed, the config may not be accurate, so report empty.
     callback_.Run(DnsConfig());
   } else {
     callback_.Run(dns_config_);
   }
 }
 
 }  // namespace net