Consistently suggest ephemeral port for QUIC client

net/socket/socket_test_util.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/socket/socket_test_util.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 105 matching lines @@
   if (logging::LOG_INFO < logging::GetMinLogLevel())
     return;
   DVLOG(1) << "Async:   " << (r.mode == ASYNC)
            << "\nResult:  " << r.result;
   DumpData(r.data, r.data_len);
   const char* stop = (r.sequence_number & MockRead::STOPLOOP) ? " (STOP)" : "";
   DVLOG(1) << "Stage:   " << (r.sequence_number & ~MockRead::STOPLOOP) << stop
            << "\nTime:    " << r.time_stamp.ToInternalValue();
 }
 
+void ExerciseSocketRandomNumberGenerator(const RandIntCallback& rand_int_cb) {
+  // Socket connect is supposed to call for some random suggestions for ports.
+  // We call 3 times so that the quic_stream_factory will know this function
+  // was consulted (it has a DCHECK), but will not actually DCHECK the
+  // resulting ephemeral port (which we don't set).
+  for (int count = 3; count > 0; --count)
+    rand_int_cb.Run(1000, 2000);
+}

[Ryan Hamilton, 2013/12/08 23:22:21]

Please revert the changes in this file until we're ready to land the DCHECK
again.

[jar (doing other things), 2013/12/08 23:30:46]

Done.

+
 }  // namespace
 
 MockConnect::MockConnect() : mode(ASYNC), result(OK) {
   IPAddressNumber ip;
   CHECK(ParseIPLiteralToNumber("192.0.2.33", &ip));
   peer_addr = IPEndPoint(ip, 0);
 }
 
 MockConnect::MockConnect(IoMode io_mode, int r) : mode(io_mode), result(r) {
   IPAddressNumber ip;
@@ skipping 520 matching lines @@
   mock_data_.ResetNextIndex();
   mock_ssl_data_.ResetNextIndex();
 }
 
 scoped_ptr<DatagramClientSocket>
 MockClientSocketFactory::CreateDatagramClientSocket(
     DatagramSocket::BindType bind_type,
     const RandIntCallback& rand_int_cb,
     net::NetLog* net_log,
     const net::NetLog::Source& source) {
+  ExerciseSocketRandomNumberGenerator(rand_int_cb);
   SocketDataProvider* data_provider = mock_data_.GetNext();
   scoped_ptr<MockUDPClientSocket> socket(
       new MockUDPClientSocket(data_provider, net_log));
   data_provider->set_socket(socket.get());
   return socket.PassAs<DatagramClientSocket>();
 }
 
 scoped_ptr<StreamSocket> MockClientSocketFactory::CreateTransportClientSocket(
     const AddressList& addresses,
     net::NetLog* net_log,
@@ skipping 1120 matching lines @@
   DCHECK_LT(index, ssl_client_sockets_.size());
   return ssl_client_sockets_[index];
 }
 
 scoped_ptr<DatagramClientSocket>
 DeterministicMockClientSocketFactory::CreateDatagramClientSocket(
     DatagramSocket::BindType bind_type,
     const RandIntCallback& rand_int_cb,
     net::NetLog* net_log,
     const NetLog::Source& source) {
+  ExerciseSocketRandomNumberGenerator(rand_int_cb);
   DeterministicSocketData* data_provider = mock_data().GetNext();
   scoped_ptr<DeterministicMockUDPClientSocket> socket(
       new DeterministicMockUDPClientSocket(net_log, data_provider));
   data_provider->set_delegate(socket->AsWeakPtr());
   udp_client_sockets().push_back(socket.get());
   return socket.PassAs<DatagramClientSocket>();
 }
 
 scoped_ptr<StreamSocket>
 DeterministicMockClientSocketFactory::CreateTransportClientSocket(
@@ skipping 65 matching lines @@
 
 const char kSOCKS5OkRequest[] =
     { 0x05, 0x01, 0x00, 0x03, 0x04, 'h', 'o', 's', 't', 0x00, 0x50 };
 const int kSOCKS5OkRequestLength = arraysize(kSOCKS5OkRequest);
 
 const char kSOCKS5OkResponse[] =
     { 0x05, 0x00, 0x00, 0x01, 127, 0, 0, 1, 0x00, 0x50 };
 const int kSOCKS5OkResponseLength = arraysize(kSOCKS5OkResponse);
 
 }  // namespace net