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

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

Issue 1946793002: net: Add fuzzer for HostResolverImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge, fix build Created 4 years, 7 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
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/dns_socket_pool.h" 5 #include "net/dns/dns_socket_pool.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/rand_util.h" 9 #include "base/rand_util.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
11 #include "net/base/address_list.h" 11 #include "net/base/address_list.h"
12 #include "net/base/ip_endpoint.h" 12 #include "net/base/ip_endpoint.h"
13 #include "net/base/net_errors.h" 13 #include "net/base/net_errors.h"
14 #include "net/base/rand_callback.h"
15 #include "net/socket/client_socket_factory.h" 14 #include "net/socket/client_socket_factory.h"
16 #include "net/socket/stream_socket.h" 15 #include "net/socket/stream_socket.h"
17 #include "net/udp/datagram_client_socket.h" 16 #include "net/udp/datagram_client_socket.h"
18 17
19 namespace net { 18 namespace net {
20 19
21 namespace { 20 namespace {
22 21
23 // When we initialize the SocketPool, we allocate kInitialPoolSize sockets. 22 // When we initialize the SocketPool, we allocate kInitialPoolSize sockets.
24 // When we allocate a socket, we ensure we have at least kAllocateMinSize 23 // When we allocate a socket, we ensure we have at least kAllocateMinSize
25 // sockets to choose from. Freed sockets are not retained. 24 // sockets to choose from. Freed sockets are not retained.
26 25
27 // On Windows, we can't request specific (random) ports, since that will 26 // On Windows, we can't request specific (random) ports, since that will
28 // trigger firewall prompts, so request default ones, but keep a pile of 27 // trigger firewall prompts, so request default ones, but keep a pile of
29 // them. Everywhere else, request fresh, random ports each time. 28 // them. Everywhere else, request fresh, random ports each time.
30 #if defined(OS_WIN) 29 #if defined(OS_WIN)
31 const DatagramSocket::BindType kBindType = DatagramSocket::DEFAULT_BIND; 30 const DatagramSocket::BindType kBindType = DatagramSocket::DEFAULT_BIND;
32 const unsigned kInitialPoolSize = 256; 31 const unsigned kInitialPoolSize = 256;
33 const unsigned kAllocateMinSize = 256; 32 const unsigned kAllocateMinSize = 256;
34 #else 33 #else
35 const DatagramSocket::BindType kBindType = DatagramSocket::RANDOM_BIND; 34 const DatagramSocket::BindType kBindType = DatagramSocket::RANDOM_BIND;
36 const unsigned kInitialPoolSize = 0; 35 const unsigned kInitialPoolSize = 0;
37 const unsigned kAllocateMinSize = 1; 36 const unsigned kAllocateMinSize = 1;
38 #endif 37 #endif
39 38
40 } // namespace 39 } // namespace
41 40
42 DnsSocketPool::DnsSocketPool(ClientSocketFactory* socket_factory) 41 DnsSocketPool::DnsSocketPool(ClientSocketFactory* socket_factory,
42 const RandIntCallback& rand_int_callback)
43 : socket_factory_(socket_factory), 43 : socket_factory_(socket_factory),
44 rand_int_callback_(rand_int_callback),
44 net_log_(NULL), 45 net_log_(NULL),
45 nameservers_(NULL), 46 nameservers_(NULL),
46 initialized_(false) { 47 initialized_(false) {}
47 }
48 48
49 void DnsSocketPool::InitializeInternal( 49 void DnsSocketPool::InitializeInternal(
50 const std::vector<IPEndPoint>* nameservers, 50 const std::vector<IPEndPoint>* nameservers,
51 NetLog* net_log) { 51 NetLog* net_log) {
52 DCHECK(nameservers); 52 DCHECK(nameservers);
53 DCHECK(!initialized_); 53 DCHECK(!initialized_);
54 54
55 net_log_ = net_log; 55 net_log_ = net_log;
56 nameservers_ = nameservers; 56 nameservers_ = nameservers;
57 initialized_ = true; 57 initialized_ = true;
(...skipping 10 matching lines...) Expand all
68 } 68 }
69 69
70 std::unique_ptr<DatagramClientSocket> DnsSocketPool::CreateConnectedSocket( 70 std::unique_ptr<DatagramClientSocket> DnsSocketPool::CreateConnectedSocket(
71 unsigned server_index) { 71 unsigned server_index) {
72 DCHECK_LT(server_index, nameservers_->size()); 72 DCHECK_LT(server_index, nameservers_->size());
73 73
74 std::unique_ptr<DatagramClientSocket> socket; 74 std::unique_ptr<DatagramClientSocket> socket;
75 75
76 NetLog::Source no_source; 76 NetLog::Source no_source;
77 socket = socket_factory_->CreateDatagramClientSocket( 77 socket = socket_factory_->CreateDatagramClientSocket(
78 kBindType, base::Bind(&base::RandInt), net_log_, no_source); 78 kBindType, rand_int_callback_, net_log_, no_source);
79 79
80 if (socket.get()) { 80 if (socket.get()) {
81 int rv = socket->Connect((*nameservers_)[server_index]); 81 int rv = socket->Connect((*nameservers_)[server_index]);
82 if (rv != OK) { 82 if (rv != OK) {
83 VLOG(1) << "Failed to connect socket: " << rv; 83 DVLOG(1) << "Failed to connect socket: " << rv;
84 socket.reset(); 84 socket.reset();
85 } 85 }
86 } else { 86 } else {
87 LOG(WARNING) << "Failed to create socket."; 87 DVLOG(1) << "Failed to create socket.";
88 } 88 }
89 89
90 return socket; 90 return socket;
91 } 91 }
92 92
93 class NullDnsSocketPool : public DnsSocketPool { 93 class NullDnsSocketPool : public DnsSocketPool {
94 public: 94 public:
95 NullDnsSocketPool(ClientSocketFactory* factory) 95 NullDnsSocketPool(ClientSocketFactory* factory,
96 : DnsSocketPool(factory) { 96 const RandIntCallback& rand_int_callback)
97 } 97 : DnsSocketPool(factory, rand_int_callback) {}
98 98
99 void Initialize(const std::vector<IPEndPoint>* nameservers, 99 void Initialize(const std::vector<IPEndPoint>* nameservers,
100 NetLog* net_log) override { 100 NetLog* net_log) override {
101 InitializeInternal(nameservers, net_log); 101 InitializeInternal(nameservers, net_log);
102 } 102 }
103 103
104 std::unique_ptr<DatagramClientSocket> AllocateSocket( 104 std::unique_ptr<DatagramClientSocket> AllocateSocket(
105 unsigned server_index) override { 105 unsigned server_index) override {
106 return CreateConnectedSocket(server_index); 106 return CreateConnectedSocket(server_index);
107 } 107 }
108 108
109 void FreeSocket(unsigned server_index, 109 void FreeSocket(unsigned server_index,
110 std::unique_ptr<DatagramClientSocket> socket) override {} 110 std::unique_ptr<DatagramClientSocket> socket) override {}
111 111
112 private: 112 private:
113 DISALLOW_COPY_AND_ASSIGN(NullDnsSocketPool); 113 DISALLOW_COPY_AND_ASSIGN(NullDnsSocketPool);
114 }; 114 };
115 115
116 // static 116 // static
117 std::unique_ptr<DnsSocketPool> DnsSocketPool::CreateNull( 117 std::unique_ptr<DnsSocketPool> DnsSocketPool::CreateNull(
118 ClientSocketFactory* factory) { 118 ClientSocketFactory* factory,
119 return std::unique_ptr<DnsSocketPool>(new NullDnsSocketPool(factory)); 119 const RandIntCallback& rand_int_callback) {
120 return std::unique_ptr<DnsSocketPool>(
121 new NullDnsSocketPool(factory, rand_int_callback));
120 } 122 }
121 123
122 class DefaultDnsSocketPool : public DnsSocketPool { 124 class DefaultDnsSocketPool : public DnsSocketPool {
123 public: 125 public:
124 DefaultDnsSocketPool(ClientSocketFactory* factory) 126 DefaultDnsSocketPool(ClientSocketFactory* factory,
125 : DnsSocketPool(factory) { 127 const RandIntCallback& rand_int_callback)
126 }; 128 : DnsSocketPool(factory, rand_int_callback){};
127 129
128 ~DefaultDnsSocketPool() override; 130 ~DefaultDnsSocketPool() override;
129 131
130 void Initialize(const std::vector<IPEndPoint>* nameservers, 132 void Initialize(const std::vector<IPEndPoint>* nameservers,
131 NetLog* net_log) override; 133 NetLog* net_log) override;
132 134
133 std::unique_ptr<DatagramClientSocket> AllocateSocket( 135 std::unique_ptr<DatagramClientSocket> AllocateSocket(
134 unsigned server_index) override; 136 unsigned server_index) override;
135 137
136 void FreeSocket(unsigned server_index, 138 void FreeSocket(unsigned server_index,
137 std::unique_ptr<DatagramClientSocket> socket) override; 139 std::unique_ptr<DatagramClientSocket> socket) override;
138 140
139 private: 141 private:
140 void FillPool(unsigned server_index, unsigned size); 142 void FillPool(unsigned server_index, unsigned size);
141 143
142 typedef std::vector<DatagramClientSocket*> SocketVector; 144 typedef std::vector<DatagramClientSocket*> SocketVector;
143 145
144 std::vector<SocketVector> pools_; 146 std::vector<SocketVector> pools_;
145 147
146 DISALLOW_COPY_AND_ASSIGN(DefaultDnsSocketPool); 148 DISALLOW_COPY_AND_ASSIGN(DefaultDnsSocketPool);
147 }; 149 };
148 150
149 // static 151 // static
150 std::unique_ptr<DnsSocketPool> DnsSocketPool::CreateDefault( 152 std::unique_ptr<DnsSocketPool> DnsSocketPool::CreateDefault(
151 ClientSocketFactory* factory) { 153 ClientSocketFactory* factory,
152 return std::unique_ptr<DnsSocketPool>(new DefaultDnsSocketPool(factory)); 154 const RandIntCallback& rand_int_callback) {
155 return std::unique_ptr<DnsSocketPool>(
156 new DefaultDnsSocketPool(factory, rand_int_callback));
153 } 157 }
154 158
155 void DefaultDnsSocketPool::Initialize( 159 void DefaultDnsSocketPool::Initialize(
156 const std::vector<IPEndPoint>* nameservers, 160 const std::vector<IPEndPoint>* nameservers,
157 NetLog* net_log) { 161 NetLog* net_log) {
158 InitializeInternal(nameservers, net_log); 162 InitializeInternal(nameservers, net_log);
159 163
160 DCHECK(pools_.empty()); 164 DCHECK(pools_.empty());
161 const unsigned num_servers = nameservers->size(); 165 const unsigned num_servers = nameservers->size();
162 pools_.resize(num_servers); 166 pools_.resize(num_servers);
163 for (unsigned server_index = 0; server_index < num_servers; ++server_index) 167 for (unsigned server_index = 0; server_index < num_servers; ++server_index)
164 FillPool(server_index, kInitialPoolSize); 168 FillPool(server_index, kInitialPoolSize);
165 } 169 }
166 170
167 DefaultDnsSocketPool::~DefaultDnsSocketPool() { 171 DefaultDnsSocketPool::~DefaultDnsSocketPool() {
168 unsigned num_servers = pools_.size(); 172 unsigned num_servers = pools_.size();
169 for (unsigned server_index = 0; server_index < num_servers; ++server_index) { 173 for (unsigned server_index = 0; server_index < num_servers; ++server_index) {
170 SocketVector& pool = pools_[server_index]; 174 SocketVector& pool = pools_[server_index];
171 STLDeleteElements(&pool); 175 STLDeleteElements(&pool);
172 } 176 }
173 } 177 }
174 178
175 std::unique_ptr<DatagramClientSocket> DefaultDnsSocketPool::AllocateSocket( 179 std::unique_ptr<DatagramClientSocket> DefaultDnsSocketPool::AllocateSocket(
176 unsigned server_index) { 180 unsigned server_index) {
177 DCHECK_LT(server_index, pools_.size()); 181 DCHECK_LT(server_index, pools_.size());
178 SocketVector& pool = pools_[server_index]; 182 SocketVector& pool = pools_[server_index];
179 183
180 FillPool(server_index, kAllocateMinSize); 184 FillPool(server_index, kAllocateMinSize);
181 if (pool.size() == 0) { 185 if (pool.size() == 0) {
182 LOG(WARNING) << "No DNS sockets available in pool " << server_index << "!"; 186 DVLOG(1) << "No DNS sockets available in pool " << server_index << "!";
183 return std::unique_ptr<DatagramClientSocket>(); 187 return std::unique_ptr<DatagramClientSocket>();
184 } 188 }
185 189
186 if (pool.size() < kAllocateMinSize) { 190 if (pool.size() < kAllocateMinSize) {
187 LOG(WARNING) << "Low DNS port entropy: wanted " << kAllocateMinSize 191 DVLOG(1) << "Low DNS port entropy: wanted " << kAllocateMinSize
188 << " sockets to choose from, but only have " << pool.size() 192 << " sockets to choose from, but only have " << pool.size()
189 << " in pool " << server_index << "."; 193 << " in pool " << server_index << ".";
190 } 194 }
191 195
192 unsigned socket_index = base::RandInt(0, pool.size() - 1); 196 unsigned socket_index = rand_int_callback().Run(0, pool.size() - 1);
eroman 2016/06/01 01:47:21 Rather than exposing the callback , how about expo
mmenke 2016/06/01 21:21:51 Done. Agree it's a bit nicer, though since we're
193 DatagramClientSocket* socket = pool[socket_index]; 197 DatagramClientSocket* socket = pool[socket_index];
194 pool[socket_index] = pool.back(); 198 pool[socket_index] = pool.back();
195 pool.pop_back(); 199 pool.pop_back();
196 200
197 return std::unique_ptr<DatagramClientSocket>(socket); 201 return std::unique_ptr<DatagramClientSocket>(socket);
198 } 202 }
199 203
200 void DefaultDnsSocketPool::FreeSocket( 204 void DefaultDnsSocketPool::FreeSocket(
201 unsigned server_index, 205 unsigned server_index,
202 std::unique_ptr<DatagramClientSocket> socket) { 206 std::unique_ptr<DatagramClientSocket> socket) {
203 DCHECK_LT(server_index, pools_.size()); 207 DCHECK_LT(server_index, pools_.size());
204 } 208 }
205 209
206 void DefaultDnsSocketPool::FillPool(unsigned server_index, unsigned size) { 210 void DefaultDnsSocketPool::FillPool(unsigned server_index, unsigned size) {
207 SocketVector& pool = pools_[server_index]; 211 SocketVector& pool = pools_[server_index];
208 212
209 for (unsigned pool_index = pool.size(); pool_index < size; ++pool_index) { 213 for (unsigned pool_index = pool.size(); pool_index < size; ++pool_index) {
210 DatagramClientSocket* socket = 214 DatagramClientSocket* socket =
211 CreateConnectedSocket(server_index).release(); 215 CreateConnectedSocket(server_index).release();
212 if (!socket) 216 if (!socket)
213 break; 217 break;
214 pool.push_back(socket); 218 pool.push_back(socket);
215 } 219 }
216 } 220 }
217 221
218 } // namespace net 222 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698