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

webrtc/p2p/base/stunport.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 36 matching lines @@
     if (!port->Init()) {
       delete port;
       port = NULL;
     }
     return port;
   }
 
   static UDPPort* 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,
                          const std::string& origin,
                          bool emit_local_for_anyaddress) {
     UDPPort* port =
-        new UDPPort(thread, factory, network, ip, min_port, max_port, username,
+        new UDPPort(thread, factory, network, min_port, max_port, username,
                     password, origin, emit_local_for_anyaddress);
     if (!port->Init()) {
       delete port;
       port = NULL;
     }
     return port;
   }
 
   virtual ~UDPPort();
 
@@ skipping 44 matching lines @@
   }
   // Returns true if there is a pending request with type |msg_type|.
   bool HasPendingRequest(int msg_type) {
     return requests_.HasRequest(msg_type);
   }
 
  protected:
   UDPPort(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,
           const std::string& origin,
           bool emit_local_for_anyaddress);
 
   UDPPort(rtc::Thread* thread,
           rtc::PacketSocketFactory* factory,
           rtc::Network* network,
@@ skipping 111 matching lines @@
   bool emit_local_for_anyaddress_;
 
   friend class StunBindingRequest;
 };
 
 class StunPort : public UDPPort {
  public:
   static StunPort* 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,
                           const ServerAddresses& servers,
                           const std::string& origin) {
-    StunPort* port = new StunPort(thread, factory, network,
-                                  ip, min_port, max_port,
-                                  username, password, servers,
-                                  origin);
+    StunPort* port = new StunPort(thread, factory, network, min_port, max_port,
+                                  username, password, servers, origin);
     if (!port->Init()) {
       delete port;
       port = NULL;
     }
     return port;
   }
 
   virtual ~StunPort() {}
 
   virtual void PrepareAddress() {
     SendStunBindingRequests();
   }
 
  protected:
   StunPort(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,
            const ServerAddresses& servers,
            const std::string& origin)
       : UDPPort(thread,
                 factory,
                 network,
-                ip,
                 min_port,
                 max_port,
                 username,
                 password,
                 origin,
                 false) {
     // UDPPort will set these to local udp, updating these to STUN.
     set_type(STUN_PORT_TYPE);
     set_server_addresses(servers);
   }
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_STUNPORT_H_