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

Side by Side Diff: net/dns/address_sorter_posix_unittest.cc

Issue 1565303002: Change IPEndpoint::address() to return a net::IPAddress (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase for ChromeOS Created 4 years, 10 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 unified diff | Download patch
« no previous file with comments | « net/dns/address_sorter_posix.cc ('k') | net/dns/address_sorter_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/dns/address_sorter_posix.h" 5 #include "net/dns/address_sorter_posix.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "net/base/net_errors.h" 10 #include "net/base/net_errors.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 NOTIMPLEMENTED(); 66 NOTIMPLEMENTED();
67 return ERR_NOT_IMPLEMENTED; 67 return ERR_NOT_IMPLEMENTED;
68 } 68 }
69 NetworkChangeNotifier::NetworkHandle GetBoundNetwork() const override { 69 NetworkChangeNotifier::NetworkHandle GetBoundNetwork() const override {
70 return NetworkChangeNotifier::kInvalidNetworkHandle; 70 return NetworkChangeNotifier::kInvalidNetworkHandle;
71 } 71 }
72 72
73 int Connect(const IPEndPoint& remote) override { 73 int Connect(const IPEndPoint& remote) override {
74 if (connected_) 74 if (connected_)
75 return ERR_UNEXPECTED; 75 return ERR_UNEXPECTED;
76 AddressMapping::const_iterator it = mapping_->find(remote.address()); 76 AddressMapping::const_iterator it =
77 mapping_->find(remote.address().bytes());
77 if (it == mapping_->end()) 78 if (it == mapping_->end())
78 return ERR_FAILED; 79 return ERR_FAILED;
79 connected_ = true; 80 connected_ = true;
80 local_endpoint_ = IPEndPoint(it->second, 39874 /* arbitrary port */); 81 local_endpoint_ = IPEndPoint(it->second, 39874 /* arbitrary port */);
81 return OK; 82 return OK;
82 } 83 }
83 84
84 const BoundNetLog& NetLog() const override { return net_log_; } 85 const BoundNetLog& NetLog() const override { return net_log_; }
85 86
86 private: 87 private:
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 AddMapping("4000::1", "4000::10"); // global unicast 323 AddMapping("4000::1", "4000::10"); // global unicast
323 AddMapping("ff32::2", "fe81::20"); // deprecated link-local multicast 324 AddMapping("ff32::2", "fe81::20"); // deprecated link-local multicast
324 GetSourceInfo("fe81::20")->deprecated = true; 325 GetSourceInfo("fe81::20")->deprecated = true;
325 const char* const addresses[] = { "ff3e::1", "ff32::2", "4000::1", "ff32::1", 326 const char* const addresses[] = { "ff3e::1", "ff32::2", "4000::1", "ff32::1",
326 "::1", "8.0.0.1", NULL }; 327 "::1", "8.0.0.1", NULL };
327 const int order[] = { 4, 3, 0, 2, 1, -1 }; 328 const int order[] = { 4, 3, 0, 2, 1, -1 };
328 Verify(addresses, order); 329 Verify(addresses, order);
329 } 330 }
330 331
331 } // namespace net 332 } // namespace net
OLDNEW
« no previous file with comments | « net/dns/address_sorter_posix.cc ('k') | net/dns/address_sorter_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698