Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(312)

Unified Diff: net/dns/address_sorter_posix.cc

Issue 10442098: [net/dns] Resolve AF_UNSPEC on dual-stacked systems. Sort addresses according to RFC3484. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Minor edits. Fix one typo in variable name. Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/dns/address_sorter_posix.cc
diff --git a/net/dns/address_sorter_posix.cc b/net/dns/address_sorter_posix.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d7ac4e1ad160139461e5fe7d8a628ef99df5cc25
--- /dev/null
+++ b/net/dns/address_sorter_posix.cc
@@ -0,0 +1,479 @@
+// 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/address_sorter.h"
+
+#include <stdint.h>
+#include <netinet/in.h>
mmenke 2012/07/30 15:37:00 nit: Not in alphabetical order.
szym 2012/07/30 16:28:45 "stdint.h" is needed for "netinet/in.h", but it se
+
+#if defined(OS_MACOSX) || defined(OS_BSD)
+#include <sys/socket.h> // Must be included before ifaddrs.h.
+#include <ifaddrs.h>
+#include <net/if.h>
+#include <netinet/in_var.h>
+#include <string.h>
mmenke 2012/07/30 15:37:00 Why is this needed?
szym 2012/07/30 16:28:45 memcpy in line 453. But now I see it's included in
+#include <sys/ioctl.h>
+#endif
+
+#include <algorithm>
+#include <map>
+#include <vector>
+
+#include "base/eintr_wrapper.h"
+#include "base/logging.h"
+#include "base/memory/scoped_vector.h"
+#include "net/base/address_list.h"
+#include "net/base/net_errors.h"
+#include "net/base/net_util.h"
+#include "net/base/network_change_notifier.h"
+#include "net/socket/client_socket_factory.h"
+#include "net/udp/datagram_client_socket.h"
+
+#if defined(OS_LINUX)
+#include "net/base/address_tracker_linux.h"
+#endif
+
+namespace net {
+
+namespace {
+
+// Address sorting is performed according to RFC3484 with revisions.
+// http://tools.ietf.org/html/draft-ietf-6man-rfc3484bis-03
mmenke 2012/07/30 15:37:00 They're up to http://tools.ietf.org/html/draft-iet
+// The default policy has been updated as in Linux:
+// http://www.akkadia.org/drepper/linux-rfc3484.html
mmenke 2012/07/30 19:40:34 Is this still needed? Looks like the latest 3484b
szym 2012/07/30 20:55:52 You're right. All problems raised there are alread
+// Precedence and label are separate to support override through /etc/gai.conf.
+
+// Generic policy entry.
+struct PolicyEntry {
+ // IPv4 addresses must be mapped to IPv6.
+ unsigned char prefix[kIPv6AddressSize];
+ unsigned prefix_length;
+ unsigned value;
+};
+
+typedef std::vector<PolicyEntry> PolicyTable;
+
+// Returns true if |p1| should precede |p2| in the table.
+// Sorts table by decreasing prefix size to allow longest prefix matching.
+bool ComparePolicy(const PolicyEntry& p1, const PolicyEntry& p2) {
+ return p1.prefix_length > p2.prefix_length;
+}
+
+// Creates sorted PolicyTable from |table| with |size| entries.
+PolicyTable LoadPolicy(PolicyEntry* table, size_t size) {
+ PolicyTable result(table, table + size);
+ std::sort(result.begin(), result.end(), ComparePolicy);
+ return result;
+}
+
+// Search |table| for matching prefix of |address|. |table| must be sorted by
+// descending prefix (prefix of another prefix must be later in table).
+unsigned GetPolicyValue(const PolicyTable& table,
+ const IPAddressNumber& address) {
+ if (address.size() == kIPv4AddressSize)
+ return GetPolicyValue(table, ConvertIPv4NumberToIPv6Number(address));
mmenke 2012/07/30 15:37:00 I think converting everything up front may be a li
szym 2012/07/30 16:28:45 I agree, although converting everything up front w
+ for (unsigned i = 0; i < table.size(); ++i) {
+ const PolicyEntry& entry = table[i];
+ IPAddressNumber prefix(entry.prefix, entry.prefix + kIPv6AddressSize);
+ if (IPNumberMatchesPrefix(address, prefix, entry.prefix_length))
+ return entry.value;
+ }
+ NOTREACHED();
+ // The last entry is the least restrictive, so assume it's default.
+ return table.back().value;
+}
+
+enum AddressScope {
+ SCOPE_NODELOCAL = 1,
+ SCOPE_LINKLOCAL = 2,
+ SCOPE_SITELOCAL = 5,
+ SCOPE_ORGLOCAL = 8,
+ SCOPE_GLOBAL = 14,
+};
+
+bool IsMulticast(const IPAddressNumber& address) {
+ return address[0] == 0xFF;
+}
+
+AddressScope GetMulticastScope(const IPAddressNumber& address) {
+ return static_cast<AddressScope>(address[1] & 0x0F);
+}
+
+bool IsIPv6Loopback(const IPAddressNumber& address) {
+ // IN6_IS_ADDR_LOOPBACK
+ unsigned char kLoopback[kIPv6AddressSize] = {
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1,
+ };
+ return address == IPAddressNumber(kLoopback, kLoopback + kIPv6AddressSize);
+}
+
+bool IsLinkLocal(const IPAddressNumber& address) {
+ // IN6_IS_ADDR_LINKLOCAL
+ return (address[0] == 0xFE) && ((address[1] & 0xC0) == 0x80);
+}
+
+bool IsSiteLocal(const IPAddressNumber& address) {
+ // IN6_IS_ADDR_SITELOCAL
+ return (address[0] == 0xFE) && ((address[1] & 0xC0) == 0xC0);
+}
+
+AddressScope GetScope(const PolicyTable& table,
+ const IPAddressNumber& address) {
+ if (address.size() == kIPv6AddressSize) {
mmenke 2012/07/30 15:37:00 Should we handle IPv4 mapped addresses here? If s
szym 2012/07/30 16:28:45 Good question. Now that I think about it, I wonder
+ if (IsMulticast(address)) {
+ return GetMulticastScope(address);
+ } else if (IsIPv6Loopback(address) || IsLinkLocal(address)) {
+ return SCOPE_LINKLOCAL;
+ } else if (IsSiteLocal(address)) {
+ return SCOPE_SITELOCAL;
+ } else {
+ return SCOPE_GLOBAL;
+ }
+ } else if (address.size() == kIPv4AddressSize) {
+ return static_cast<AddressScope>(GetPolicyValue(table, address));
+ } else {
+ NOTREACHED();
+ return SCOPE_NODELOCAL;
+ }
+}
+
+// Default policy table. RFC 3484, Section 2.1. Updated for glibc.
+PolicyEntry kDefaultPrecedenceTable[] = {
+ // ::1/128 -- loopback
+ { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 }, 128, 60 },
+ // fc00::/7 -- multicast
szym 2012/07/30 20:55:52 not "multicast", but "unique local address"
+ { { 0xFC }, 7, 50 },
+ // ::/0 -- any
+ { { }, 0, 40 },
+ // ::ffff:0:0/96 -- IPv4 mapped
+ { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF }, 96, 30 },
+ // 2002::/16 -- 6to4
+ { { 0x20, 0x02, }, 17, 20 },
+ // 2001::/32 -- Teredo
+ { { 0x20, 0x01, 0, 0 }, 32, 10 },
mmenke 2012/07/30 19:40:34 The tables look a bit different from the tables in
szym 2012/07/30 20:55:52 Ah. As bionic, this is following: http://tools.iet
+ // ::/96 -- IPv4 compatible
+ { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 96, 1 },
+ // fec0::/16 -- unique local address
+ { { 0xFE, 0xC0 }, 16, 1 },
mmenke 2012/07/30 19:40:34 This looks wrong. fc00::/7 is unique local. fec0:
+ // 3ffe::/16 -- 6bone
+ { { 0x3F, 0xFE }, 16, 1 },
+};
+
+PolicyEntry kDefaultLabelTable[] = {
+ // ::1/128 -- loopback
+ { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 }, 128, 0 },
+ // fc00::/7 -- multicast
+ { { 0xFC }, 7, 1 },
+ // ::/0 -- any
+ { { }, 0, 2 },
+ // ::ffff:0:0/96 -- IPv4 mapped
+ { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF }, 96, 3 },
+ // 2002::/16 -- 6to4
+ { { 0x20, 0x02, }, 17, 4 },
+ // 2001::/32 -- Teredo
+ { { 0x20, 0x01, 0, 0 }, 32, 5 },
+ // ::/96 -- IPv4 compatible
+ { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 96, 10 },
+ // fec0::/16 -- unique local address
+ { { 0xFE, 0xC0 }, 16, 11 },
+ // 3ffe::/16 -- 6bone
+ { { 0x3F, 0xFE }, 16, 12 },
+};
+
+// Default mapping of IPv4 addresses to scope.
+PolicyEntry kDefaultScopeTable[] = {
mmenke 2012/07/30 15:37:00 Think this name is very confusing. May be worth j
szym 2012/07/30 16:28:45 The reason why this exists (and has 'Default' in n
mmenke 2012/07/30 19:40:34 Curiously, man gai.conf didn't mention the field,
szym 2012/07/30 20:55:52 My "man gai.conf" includes: ==== scopev4 mask valu
+ { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF, 0x7F }, 104,
+ SCOPE_LINKLOCAL },
+ { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF, 0xA9, 0xFE }, 112,
+ SCOPE_LINKLOCAL },
+ { { }, 0, SCOPE_GLOBAL },
+};
+
+// Returns number of matching initial bits between the addresses |a1| and |a2|.
+unsigned CommonPrefixLength(const IPAddressNumber& a1,
+ const IPAddressNumber& a2) {
+ DCHECK_EQ(a1.size(), a2.size());
+ for (size_t i = 0; i < a1.size(); ++i) {
+ unsigned diff = a1[i] ^ a2[i];
+ if (!diff)
+ continue;
+ for (unsigned j = 0; j < CHAR_BIT; ++j) {
+ if (diff & (1 << (CHAR_BIT - 1)))
+ return i * CHAR_BIT + j;
+ diff <<= 1;
+ }
+ }
+ return a1.size() * CHAR_BIT;
+}
+
+// Computes the number of leading 1-bits in |addr|.
+unsigned PrefixLength(const IPAddressNumber& addr) {
mmenke 2012/07/30 19:40:34 Suggest you rename this MaskPrefixLength(addr_mask
+ IPAddressNumber all_ones(addr.size(), 0xFF);
+ return CommonPrefixLength(addr, all_ones);
+}
+
+struct SourceAddressInfo {
+ AddressScope scope;
+ unsigned label;
+ // Values below matter only if more than one source address in the list.
+ unsigned prefix_length;
+ bool deprecated; // vs. preferred RFC4862
+ bool home; // vs. care-of RFC6275
+ bool native;
+};
+
+typedef std::map<IPAddressNumber, SourceAddressInfo> SourceAddressMap;
+
+struct SortElement {
+ IPAddressNumber address;
+ AddressScope scope;
+ unsigned precedence;
+ unsigned label;
+ const SourceAddressInfo* src;
+ unsigned common_prefix_length;
+};
+
+// Returns true iff |a1| should precede |a2| in the address list.
+// RFC 3484, section 6.
+bool CompareElements(const SortElement* a1, const SortElement* a2) {
mmenke 2012/07/30 19:40:34 Think a1 / a2 could be named better. Suggest dest
+ // Rule 1: Avoid unusable destinations.
+ // Unusable destinations are already filtered out.
+ DCHECK(a1->src);
+ DCHECK(a2->src);
+
+ // Rule 2: Prefer matching scope.
+ bool scope_match1 = (a1->src->scope == a1->scope);
+ bool scope_match2 = (a2->src->scope == a2->scope);
+ if (scope_match1 != scope_match2)
+ return scope_match1;
+
+ // Rule 3: Avoid deprecated addresses.
+ if (a1->src->deprecated != a2->src->deprecated)
+ return !a1->src->deprecated;
+
+ // Rule 4: Prefer home addresses.
+ if (a1->src->home != a2->src->home)
+ return !a1->src->home;
mmenke 2012/07/30 19:40:34 Shouldn't this be "return a1->src->home;"? (No neg
szym 2012/07/30 20:55:52 Yes.
+
+ // Rule 5: Prefer matching label.
+ bool label_match1 = (a1->src->label == a1->label);
+ bool label_match2 = (a2->src->label == a2->label);
+ if (label_match1 != label_match2)
+ return label_match1;
+
+ // Rule 6: Prefer higher precedence.
+ if (a1->precedence != a2->precedence)
+ return a1->precedence > a2->precedence;
+
+ // Rule 7: Prefer native transport.
+ if (a1->src->native != a2->src->native)
+ return !a1->src->native;
mmenke 2012/07/30 19:40:34 Believe the negation here is also wrong.
szym 2012/07/30 20:55:52 Yes.
+
+ // Rule 8: Prefer smaller scope.
+ if (a1->scope != a2->scope)
+ return a1->scope < a2->scope;
+
+ // Rule 9: Use longest matching prefix. Only for matching address families.
+ if (a1->address.size() == a2->address.size()) {
+ if (a1->common_prefix_length != a2->common_prefix_length)
+ return a1->common_prefix_length > a2->common_prefix_length;
+ }
+
+ // Rule 10: Leave the order unchanged.
+ // stable_sort takes care of that.
+ return false;
+}
+
+class AddressSorterPosix : public AddressSorter,
+ public NetworkChangeNotifier::IPAddressObserver {
+ public:
+ explicit AddressSorterPosix(ClientSocketFactory* socket_factory);
+ virtual ~AddressSorterPosix();
+
+ virtual bool Sort(AddressList* list) const OVERRIDE;
+
+ private:
+ // NetworkChangeNotifier::IPAddressObserver:
+ virtual void OnIPAddressChanged() OVERRIDE;
+
+ SourceAddressMap source_info_;
+ // For the cases when the source address is not in |source_info_|.
+ // TODO(szym): Consider simply falling back to getaddrinfo in that case.
+ SourceAddressInfo mock_source_info_;
+
+ ClientSocketFactory* socket_factory_;
+ PolicyTable precedence_table_;
+ PolicyTable label_table_;
+ PolicyTable scope_table_;
+
+ DISALLOW_COPY_AND_ASSIGN(AddressSorterPosix);
+};
+
+AddressSorterPosix::AddressSorterPosix(ClientSocketFactory* socket_factory)
+ : socket_factory_(socket_factory),
+ precedence_table_(LoadPolicy(kDefaultPrecedenceTable,
+ arraysize(kDefaultPrecedenceTable))),
+ label_table_(LoadPolicy(kDefaultLabelTable,
+ arraysize(kDefaultLabelTable))),
+ scope_table_(LoadPolicy(kDefaultScopeTable,
+ arraysize(kDefaultScopeTable))) {
+ mock_source_info_.scope = SCOPE_GLOBAL;
+ mock_source_info_.deprecated = false;
+ mock_source_info_.home = false;
+ mock_source_info_.native = false;
+ mock_source_info_.label = static_cast<unsigned>(-1);
+ mock_source_info_.prefix_length = 0;
+ NetworkChangeNotifier::AddIPAddressObserver(this);
+}
+
+AddressSorterPosix::~AddressSorterPosix() {
+ NetworkChangeNotifier::RemoveIPAddressObserver(this);
+}
+
+bool AddressSorterPosix::Sort(AddressList* list) const {
+ ScopedVector<SortElement> sort_list;
+
+ for (size_t i = 0; i < list->size(); ++i) {
+ scoped_ptr<SortElement> el(new SortElement());
mmenke 2012/07/30 19:40:34 Think using "el" for a variable name violates Goog
+ el->address = (*list)[i].address();
+ el->scope = GetScope(scope_table_, el->address);
+ el->precedence = GetPolicyValue(precedence_table_, el->address);
+ el->label = GetPolicyValue(label_table_, el->address);
+
+ // Each socket can only be bound once.
+ scoped_ptr<DatagramClientSocket> socket(
+ socket_factory_->CreateDatagramClientSocket(
+ DatagramSocket::DEFAULT_BIND,
+ RandIntCallback(),
+ NULL /* NetLog */,
+ NetLog::Source()));
+
+ // Even though no packets are sent, cannot use port 0 in Connect.
+ IPEndPoint dest(el->address, 80 /* port */);
+ int rv = socket->Connect(dest);
+ if (rv != OK) {
+ LOG(WARNING) << "Could not connect to " << dest.ToStringWithoutPort()
+ << " reason " << rv;
+ continue;
+ }
+ // Filter out unsable destinations.
mmenke 2012/07/30 19:40:34 nit: unuseable
+ IPEndPoint src;
+ rv = socket->GetLocalAddress(&src);
+ if (rv != OK) {
+ LOG(WARNING) << "Could not get local address for "
+ << dest.ToStringWithoutPort() << " reason " << rv;
+ continue;
+ }
+
+ SourceAddressMap::const_iterator it = source_info_.find(src.address());
+ if (it != source_info_.end()) {
+ el->src = &(it->second);
+ } else {
+ // If |source_info_| is out of date, we still want to sort, although
+ // the HostCache will need to be cleared once it is updated.
+ el->src = &mock_source_info_;
mmenke 2012/07/30 19:40:34 Wonder if this case could occur often enough that
szym 2012/07/30 20:55:52 If the AddressTrackerLinux implementation is trust
mmenke 2012/07/30 21:07:17 That's probably more effort than it's worth... As
szym 2012/08/06 23:22:20 I figured the code looks cleaner without mock_sour
+ }
+
+ if (el->address.size() == src.address().size()) {
+ el->common_prefix_length = std::min(
+ CommonPrefixLength(el->address, src.address()),
+ el->src->prefix_length);
+ }
+ sort_list.push_back(el.release());
+ }
+
+ std::stable_sort(sort_list.begin(), sort_list.end(), CompareElements);
+
+ list->clear();
+ for (size_t i = 0; i < sort_list.size(); ++i)
+ list->push_back(IPEndPoint(sort_list[i]->address, 0 /* port */));
+
+ return true;
+}
+
+void AddressSorterPosix::OnIPAddressChanged() {
+#if defined(OS_LINUX)
+ const internal::AddressTrackerLinux* tracker =
+ NetworkChangeNotifier::GetAddressTracker();
+ if (!tracker)
+ return;
szym 2012/07/30 16:28:45 There's a potential race during shutdown of Networ
+ typedef internal::AddressTrackerLinux::AddressMap AddressMap;
+ AddressMap map = tracker->GetAddressMap();
+ source_info_.clear();
+ for (AddressMap::const_iterator it = map.begin(); it != map.end(); ++it) {
+ const IPAddressNumber& address = it->first;
+ const struct ifaddrmsg& msg = it->second;
+ SourceAddressInfo& info = source_info_[address];
+ info.native = false; // TODO(szym): obtain this via netlink.
+ info.deprecated = msg.ifa_flags & IFA_F_DEPRECATED;
+ info.home = msg.ifa_flags & IFA_F_HOMEADDRESS;
+ info.prefix_length = msg.ifa_prefixlen;
+ info.label = GetPolicyValue(label_table_, address);
+ info.scope = GetScope(scope_table_, address);
+ }
+#elif defined(OS_MACOSX) || defined(OS_BSD)
+ // It's not clear we will receive notification when deprecated flag changes.
+ source_info_.clear();
+ // Socket for ioctl.
+ int ioctl_socket = socket(AF_INET6, SOCK_DGRAM, 0);
+ if (ioctl_socket < 0) {
+ perror("ioctl_socket");
+ return;
+ }
+ struct ifaddrs* addrs;
+ int rv = getifaddrs(&addrs);
+ if (rv < 0) {
+ perror("getifaddrs");
+ close(ioctl_socket);
+ return;
+ }
+
+ for (struct ifaddrs* ifa = addrs; ifa != NULL; ifa = ifa->ifa_next) {
+ IPEndPoint src;
+ int rv = src.FromSockAddr(ifa->ifa_addr, ifa->ifa_addr->sa_len);
+ if (rv != OK) {
+ LOG(WARNING) << "could not ToSockAddr " << rv;
mmenke 2012/07/30 15:37:00 FromSockAddr?
+ continue;
+ }
+ IPEndPoint netmask;
+ rv = netmask.FromSockAddr(ifa->ifa_netmask, ifa->ifa_addr->sa_len);
+ if (rv != OK) {
+ LOG(WARNING) << "could not ToSockAddr " << rv;
mmenke 2012/07/30 15:37:00 FromSockAddr?
+ continue;
+ }
+ SourceAddressInfo& info = source_info_[src.address()];
+ // Note: no known way to fill in |native| and |home|.
+ info.native = info.home = info.deprecated = false;
+ if (ifa->ifa_addr->sa_family == AF_INET6) {
+ struct in6_ifreq ifr = {};
+ strncpy(ifr.ifr_name, ifa->ifa_name, sizeof(ifr.ifr_name) - 1);
+ DCHECK_LE(ifa->ifa_addr->sa_len, sizeof(ifr.ifr_ifru.ifru_addr));
+ memcpy(&ifr.ifr_ifru.ifru_addr, ifa->ifa_addr, ifa->ifa_addr->sa_len);
+ rv = ioctl(ioctl_socket, SIOCGIFAFLAG_IN6, &ifr);
+ if (rv < 0) {
+ perror("ioctl failed ");
+ continue;
+ }
+ info.deprecated = ifr.ifr_ifru.ifru_flags & IN6_IFF_DEPRECATED;
+ }
+ info.prefix_length = PrefixLength(netmask.address());
+ info.label = GetPolicyValue(label_table_, src.address());
+ info.scope = GetScope(scope_table_, src.address());
+ }
+ freeifaddrs(addrs);
+ close(ioctl_socket);
+#endif
+}
+
+} // namespace
+
+// static
+scoped_ptr<AddressSorter> AddressSorter::CreateAddressSorter() {
+ return scoped_ptr<AddressSorter>(
+ new AddressSorterPosix(ClientSocketFactory::GetDefaultFactory()));
+}
+
+} // namespace net
+

Powered by Google App Engine
This is Rietveld 408576698