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

webrtc/rtc_base/virtualsocketserver.cc

 /*
  *  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 109 matching lines @@
 VirtualSocket::~VirtualSocket() {
   Close();
 
   for (RecvBuffer::iterator it = recv_buffer_.begin(); it != recv_buffer_.end();
        ++it) {
     delete *it;
   }
 }
 
 SocketAddress VirtualSocket::GetLocalAddress() const {
-  if (!alternative_local_addr_.IsNil())
-    return alternative_local_addr_;
   return local_addr_;
 }
 
 SocketAddress VirtualSocket::GetRemoteAddress() const {
   return remote_addr_;
 }
 
 void VirtualSocket::SetLocalAddress(const SocketAddress& addr) {
   local_addr_ = addr;
 }
 
-void VirtualSocket::SetAlternativeLocalAddress(const SocketAddress& addr) {
-  alternative_local_addr_ = addr;
-}
-
 int VirtualSocket::Bind(const SocketAddress& addr) {
   if (!local_addr_.IsNil()) {
     error_ = EINVAL;
     return -1;
   }
   local_addr_ = addr;
   int result = server_->Bind(this, &local_addr_);
   if (result != 0) {
     local_addr_.Clear();
     error_ = EADDRINUSE;
@@ skipping 478 matching lines @@
   // MessageQueue will ensure WakeUp is called if another thread sends a
   // packet.
   wakeup_.Wait(cmsWait);
   return true;
 }
 
 void VirtualSocketServer::WakeUp() {
   wakeup_.Set();
 }
 
+void VirtualSocketServer::SetAlternativeLocalAddress(
+    const rtc::IPAddress& address,
+    const rtc::IPAddress& alternative) {
+  alternative_address_mapping_[address] = alternative;
+}
+
 bool VirtualSocketServer::ProcessMessagesUntilIdle() {
   RTC_DCHECK(msg_queue_ == Thread::Current());
   stop_on_idle_ = true;
   while (!msg_queue_->empty()) {
     if (fake_clock_) {
       // If using a fake clock, advance it in millisecond increments until the
       // queue is empty.
       fake_clock_->AdvanceTime(rtc::TimeDelta::FromMilliseconds(1));
     } else {
       // Otherwise, run a normal message loop.
@@ skipping 37 matching lines @@
   // Normalize the address (turns v6-mapped addresses into v4-addresses).
   SocketAddress normalized(addr.ipaddr().Normalized(), addr.port());
 
   AddressMap::value_type entry(normalized, socket);
   return bindings_->insert(entry).second ? 0 : -1;
 }
 
 int VirtualSocketServer::Bind(VirtualSocket* socket, SocketAddress* addr) {
   RTC_DCHECK(nullptr != socket);
 
+  // Normalize the IP.
   if (!IPIsUnspec(addr->ipaddr())) {
     addr->SetIP(addr->ipaddr().Normalized());
   } else {
     RTC_NOTREACHED();
   }
 
+  // If the IP appears in |alternative_address_mapping_|, meaning the test has
+  // configured sockets bound to this IP to actually use another IP, replace
+  // the IP here.
+  auto alternative = alternative_address_mapping_.find(addr->ipaddr());
+  if (alternative != alternative_address_mapping_.end()) {
+    addr->SetIP(alternative->second);
+  }
+
+  // Assign a port if not assigned.
   if (addr->port() == 0) {
     for (int i = 0; i < kEphemeralPortCount; ++i) {
       addr->SetPort(GetNextPort());
       if (bindings_->find(*addr) == bindings_->end()) {
         break;
       }
     }
   }
 
   return Bind(socket, *addr);
@@ skipping 486 matching lines @@
 void VirtualSocketServer::SetDefaultRoute(const IPAddress& from_addr) {
   RTC_DCHECK(!IPIsAny(from_addr));
   if (from_addr.family() == AF_INET) {
     default_route_v4_ = from_addr;
   } else if (from_addr.family() == AF_INET6) {
     default_route_v6_ = from_addr;
   }
 }
 
 }  // namespace rtc