Adding PortAllocator option to support cases where sockets can't be bound.

webrtc/p2p/base/tcpport.h

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 21 matching lines @@
  public:
   static TCPPort* Create(rtc::Thread* thread,
                          rtc::PacketSocketFactory* factory,
                          rtc::Network* network,
                          const rtc::IPAddress& ip,
                          uint16_t min_port,
                          uint16_t max_port,
                          const std::string& username,
                          const std::string& password,
                          bool allow_listen) {
-    TCPPort* port = new TCPPort(thread, factory, network, ip, min_port,
-                                max_port, username, password, allow_listen);
-    if (!port->Init()) {
-      delete port;
-      port = NULL;
-    }
-    return port;
+    return new TCPPort(thread, factory, network, ip, min_port, max_port,
+                       username, password, allow_listen);
   }
   ~TCPPort() override;
 
   Connection* CreateConnection(const Candidate& address,
                                CandidateOrigin origin) override;
 
   void PrepareAddress() override;
 
   int GetOption(rtc::Socket::Option opt, int* value) override;
   int SetOption(rtc::Socket::Option opt, int value) override;
   int GetError() override;
   bool SupportsProtocol(const std::string& protocol) const override {
     return protocol == TCP_PROTOCOL_NAME || protocol == SSLTCP_PROTOCOL_NAME;
   }
 
   ProtocolType GetProtocol() const override { return PROTO_TCP; }
 
  protected:
   TCPPort(rtc::Thread* thread,
           rtc::PacketSocketFactory* factory,
           rtc::Network* network,
           const rtc::IPAddress& ip,
           uint16_t min_port,
           uint16_t max_port,
           const std::string& username,
           const std::string& password,
           bool allow_listen);
-  bool Init();
 
   // Handles sending using the local TCP socket.
   int SendTo(const void* data,
              size_t size,
              const rtc::SocketAddress& addr,
              const rtc::PacketOptions& options,
              bool payload) override;
 
   // Accepts incoming TCP connection.
   void OnNewConnection(rtc::AsyncPacketSocket* socket,
                        rtc::AsyncPacketSocket* new_socket);
 
  private:
   struct Incoming {
     rtc::SocketAddress addr;
     rtc::AsyncPacketSocket* socket;
   };
 
+  void TryCreateServerSocket();
+
   rtc::AsyncPacketSocket* GetIncoming(
       const rtc::SocketAddress& addr, bool remove = false);
 
   // Receives packet signal from the local TCP Socket.
   void OnReadPacket(rtc::AsyncPacketSocket* socket,
                     const char* data, size_t size,
                     const rtc::SocketAddress& remote_addr,
                     const rtc::PacketTime& packet_time);
 
   void OnSentPacket(rtc::AsyncPacketSocket* socket,
@@ skipping 80 matching lines @@
 
   // Allow test case to overwrite the default timeout period.
   int reconnection_timeout_;
 
   friend class TCPPort;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_TCPPORT_H_