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

Unified Diff: net/dns/address_sorter_posix.h

Issue 10855163: Revert 151586 - [net/dns] Resolve AF_UNSPEC on dual-stacked systems. Sort addresses according to RF… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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
« no previous file with comments | « net/dns/address_sorter.h ('k') | net/dns/address_sorter_posix.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/dns/address_sorter_posix.h
===================================================================
--- net/dns/address_sorter_posix.h (revision 151600)
+++ net/dns/address_sorter_posix.h (working copy)
@@ -1,94 +0,0 @@
-// 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.
-
-#ifndef NET_DNS_ADDRESS_SORTER_POSIX_H_
-#define NET_DNS_ADDRESS_SORTER_POSIX_H_
-
-#include <map>
-#include <vector>
-
-#include "base/threading/non_thread_safe.h"
-#include "net/base/address_list.h"
-#include "net/base/net_errors.h"
-#include "net/base/net_export.h"
-#include "net/base/net_util.h"
-#include "net/base/network_change_notifier.h"
-#include "net/dns/address_sorter.h"
-
-namespace net {
-
-class ClientSocketFactory;
-
-// This implementation uses explicit policy to perform the sorting. It is not
-// thread-safe and always completes synchronously.
-class NET_EXPORT_PRIVATE AddressSorterPosix
- : public AddressSorter,
- public base::NonThreadSafe,
- public NetworkChangeNotifier::IPAddressObserver {
- public:
- // 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;
-
- enum AddressScope {
- SCOPE_UNDEFINED = 0,
- SCOPE_NODELOCAL = 1,
- SCOPE_LINKLOCAL = 2,
- SCOPE_SITELOCAL = 5,
- SCOPE_ORGLOCAL = 8,
- SCOPE_GLOBAL = 14,
- };
-
- struct SourceAddressInfo {
- // Values read from policy tables.
- AddressScope scope;
- unsigned label;
-
- // Values from the OS, matter only if more than one source address is used.
- unsigned prefix_length;
- bool deprecated; // vs. preferred RFC4862
- bool home; // vs. care-of RFC6275
- bool native;
- };
-
- typedef std::map<IPAddressNumber, SourceAddressInfo> SourceAddressMap;
-
- explicit AddressSorterPosix(ClientSocketFactory* socket_factory);
- virtual ~AddressSorterPosix();
-
- // AddressSorter:
- virtual void Sort(const AddressList& list,
- const CallbackType& callback) const OVERRIDE;
-
- private:
- friend class AddressSorterPosixTest;
-
- // NetworkChangeNotifier::IPAddressObserver:
- virtual void OnIPAddressChanged() OVERRIDE;
-
- // Fills |info| with values for |address| from policy tables.
- void FillPolicy(const IPAddressNumber& address,
- SourceAddressInfo* info) const;
-
- // Mutable to allow using default values for source addresses which were not
- // found in most recent OnIPAddressChanged.
- mutable SourceAddressMap source_map_;
-
- ClientSocketFactory* socket_factory_;
- PolicyTable precedence_table_;
- PolicyTable label_table_;
- PolicyTable ipv4_scope_table_;
-
- DISALLOW_COPY_AND_ASSIGN(AddressSorterPosix);
-};
-
-} // namespace net
-
-#endif // NET_DNS_ADDRESS_SORTER_POSIX_H_
« no previous file with comments | « net/dns/address_sorter.h ('k') | net/dns/address_sorter_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698