Make Port (and subclasses) fully "Network"-based, instead of IP-based.

webrtc/rtc_base/virtualsocketserver.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 100 matching lines @@
 
   // SocketServer:
   void SetMessageQueue(MessageQueue* queue) override;
   bool Wait(int cms, bool process_io) override;
   void WakeUp() override;
 
   void SetDelayOnAddress(const rtc::SocketAddress& address, int delay_ms) {
     delay_by_ip_[address.ipaddr()] = delay_ms;
   }
 
+  // Used by TurnPortTest and TcpPortTest (for example), to mimic a case where
+  // a proxy returns the local host address instead of the original one the
+  // port was bound against. Please see WebRTC issue 3927 for more detail.
+  //
+  // If SetAlternativeLocalAddress(A, B) is called, then when something
+  // attempts to bind a socket to address A, it will get a socket bound to
+  // address B instead.
+  void SetAlternativeLocalAddress(const rtc::IPAddress& address,
+                                  const rtc::IPAddress& alternative);
+
   typedef std::pair<double, double> Point;
   typedef std::vector<Point> Function;
 
   static Function* CreateDistribution(uint32_t mean,
                                       uint32_t stddev,
                                       uint32_t samples);
 
   // Similar to Thread::ProcessMessages, but it only processes messages until
   // there are no immediate messages or pending network traffic.  Returns false
   // if Thread::Stop() was called.
@@ skipping 135 matching lines @@
 
   uint32_t bandwidth_;
   uint32_t network_capacity_;
   uint32_t send_buffer_capacity_;
   uint32_t recv_buffer_capacity_;
   uint32_t delay_mean_;
   uint32_t delay_stddev_;
   uint32_t delay_samples_;
 
   std::map<rtc::IPAddress, int> delay_by_ip_;
+  std::map<rtc::IPAddress, rtc::IPAddress> alternative_address_mapping_;
   std::unique_ptr<Function> delay_dist_;
 
   CriticalSection delay_crit_;
 
   double drop_prob_;
   bool sending_blocked_ = false;
   RTC_DISALLOW_COPY_AND_ASSIGN(VirtualSocketServer);
 };
 
 // Implements the socket interface using the virtual network.  Packets are
 // passed as messages using the message queue of the socket server.
 class VirtualSocket : public AsyncSocket,
                       public MessageHandler,
                       public sigslot::has_slots<> {
  public:
   VirtualSocket(VirtualSocketServer* server, int family, int type, bool async);
   ~VirtualSocket() override;
 
   SocketAddress GetLocalAddress() const override;
   SocketAddress GetRemoteAddress() const override;
 
-  // Used by TurnPortTest to mimic a case where proxy returns local host address
-  // instead of the original one TurnPort was bound against. Please see WebRTC
-  // issue 3927 for more detail.
-  void SetAlternativeLocalAddress(const SocketAddress& addr);
-
   int Bind(const SocketAddress& addr) override;
   int Connect(const SocketAddress& addr) override;
   int Close() override;
   int Send(const void* pv, size_t cb) override;
   int SendTo(const void* pv, size_t cb, const SocketAddress& addr) override;
   int Recv(void* pv, size_t cb, int64_t* timestamp) override;
   int RecvFrom(void* pv,
                size_t cb,
                SocketAddress* paddr,
                int64_t* timestamp) override;
@@ skipping 34 matching lines @@
   void SetLocalAddress(const SocketAddress& addr);
 
   void OnSocketServerReadyToSend();
 
   VirtualSocketServer* server_;
   int type_;
   bool async_;
   ConnState state_;
   int error_;
   SocketAddress local_addr_;
-  SocketAddress alternative_local_addr_;
   SocketAddress remote_addr_;
 
   // Pending sockets which can be Accepted
   ListenQueue* listen_queue_;
 
   // Data which tcp has buffered for sending
   SendBuffer send_buffer_;
   // Set to false if the last attempt to send resulted in EWOULDBLOCK.
   // Set back to true when the socket can send again.
   bool ready_to_send_ = true;
@@ skipping 24 matching lines @@
 
   // Store the options that are set
   OptionsMap options_map_;
 
   friend class VirtualSocketServer;
 };
 
 }  // namespace rtc
 
 #endif  // WEBRTC_RTC_BASE_VIRTUALSOCKETSERVER_H_