Revert of Prune connections based on network name.

webrtc/p2p/base/fakeportallocator.h

 /*
  *  Copyright 2010 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 76 matching lines @@
 // factory. It gathers a single loopback port, using IPv6 if available and
 // not disabled.
 class FakePortAllocatorSession : public PortAllocatorSession {
  public:
   FakePortAllocatorSession(PortAllocator* allocator,
                            rtc::Thread* network_thread,
                            rtc::PacketSocketFactory* factory,
                            const std::string& content_name,
                            int component,
                            const std::string& ice_ufrag,
-                           const std::string& ice_pwd,
-                           bool ipv6_enabled)
+                           const std::string& ice_pwd)
       : PortAllocatorSession(content_name,
                              component,
                              ice_ufrag,
                              ice_pwd,
                              allocator->flags()),
         network_thread_(network_thread),
         factory_(factory),
         ipv4_network_("network",
                       "unittest",
                       rtc::IPAddress(INADDR_LOOPBACK),
                       32),
         ipv6_network_("network",
                       "unittest",
                       rtc::IPAddress(in6addr_loopback),
                       64),
+        port_(),
         port_config_count_(0),
         stun_servers_(allocator->stun_servers()),
-        turn_servers_(allocator->turn_servers()),
-        ipv6_enabled_(ipv6_enabled) {
+        turn_servers_(allocator->turn_servers()) {
     ipv4_network_.AddIP(rtc::IPAddress(INADDR_LOOPBACK));
     ipv6_network_.AddIP(rtc::IPAddress(in6addr_loopback));
   }
 
   void SetCandidateFilter(uint32_t filter) override {
     candidate_filter_ = filter;
   }
 
-  Port* CreatePort(rtc::Network* network) {
-    Port* port = TestUDPPort::Create(network_thread_, factory_, network,
-                                     network->GetBestIP(), 0, 0, username(),
-                                     password(), std::string(), false);
-    AddPort(port);
-    return port;
-  }
-
   void StartGettingPorts() override {
-    if (!ipv4_port_) {
-      ipv4_port_.reset(CreatePort(&ipv4_network_));
-    }
-    if (!ipv6_port_ && ipv6_enabled_ && (flags() & PORTALLOCATOR_ENABLE_IPV6)) {
-      ipv6_port_.reset(CreatePort(&ipv6_network_));
+    if (!port_) {
+      rtc::Network& network =
+          (rtc::HasIPv6Enabled() && (flags() & PORTALLOCATOR_ENABLE_IPV6))
+              ? ipv6_network_
+              : ipv4_network_;
+      port_.reset(TestUDPPort::Create(network_thread_, factory_, &network,
+                                      network.GetBestIP(), 0, 0, username(),
+                                      password(), std::string(), false));
+      port_->SignalDestroyed.connect(
+          this, &FakePortAllocatorSession::OnPortDestroyed);
+      AddPort(port_.get());
     }
     ++port_config_count_;
     running_ = true;
   }
 
   void StopGettingPorts() override { running_ = false; }
   bool IsGettingPorts() override { return running_; }
   void ClearGettingPorts() override {}
 
   std::vector<PortInterface*> ReadyPorts() const override {
     return ready_ports_;
   }
   std::vector<Candidate> ReadyCandidates() const override {
     return candidates_;
   }
-  void PruneAllPorts() override {
-    if (ipv4_port_) {
-      ipv4_port_->Prune();
-    }
-    if (ipv6_port_) {
-      ipv6_port_->Prune();
-    }
-  }
+  void PruneAllPorts() override { port_->Prune(); }
   bool CandidatesAllocationDone() const override { return allocation_done_; }
 
   int port_config_count() { return port_config_count_; }
 
   const ServerAddresses& stun_servers() const { return stun_servers_; }
 
   const std::vector<RelayServerConfig>& turn_servers() const {
     return turn_servers_;
   }
 
   uint32_t candidate_filter() const { return candidate_filter_; }
 
   int transport_info_update_count() const {
     return transport_info_update_count_;
   }
 
  protected:
   void UpdateIceParametersInternal() override {
     // Since this class is a fake and this method only is overridden for tests,
     // we don't need to actually update the transport info.
     ++transport_info_update_count_;
   }
 
  private:
   void AddPort(cricket::Port* port) {
     port->set_component(component());
     port->set_generation(generation());
     port->SignalPortComplete.connect(this,
                                      &FakePortAllocatorSession::OnPortComplete);
-    port->SignalDestroyed.connect(this,
-                                  &FakePortAllocatorSession::OnPortDestroyed);
     port->PrepareAddress();
     ready_ports_.push_back(port);
     SignalPortReady(this, port);
     port->KeepAliveUntilPruned();
   }
   void OnPortComplete(cricket::Port* port) {
     const std::vector<Candidate>& candidates = port->Candidates();
     candidates_.insert(candidates_.end(), candidates.begin(), candidates.end());
     SignalCandidatesReady(this, candidates);
 
     allocation_done_ = true;
     SignalCandidatesAllocationDone(this);
   }
   void OnPortDestroyed(cricket::PortInterface* port) {
     // Don't want to double-delete port if it deletes itself.
-    if (port == ipv4_port_.get()) {
-      ipv4_port_.release();
-    } else if (port == ipv6_port_.get()) {
-      ipv6_port_.release();
-    }
+    port_.release();
   }
 
   rtc::Thread* network_thread_;
   rtc::PacketSocketFactory* factory_;
   rtc::Network ipv4_network_;
   rtc::Network ipv6_network_;
-  std::unique_ptr<cricket::Port> ipv4_port_;
-  std::unique_ptr<cricket::Port> ipv6_port_;
+  std::unique_ptr<cricket::Port> port_;
   int port_config_count_;
   std::vector<Candidate> candidates_;
   std::vector<PortInterface*> ready_ports_;
   bool allocation_done_ = false;
   ServerAddresses stun_servers_;
   std::vector<RelayServerConfig> turn_servers_;
   uint32_t candidate_filter_ = CF_ALL;
   int transport_info_update_count_ = 0;
-  bool ipv6_enabled_;
   bool running_ = false;
 };
 
 class FakePortAllocator : public cricket::PortAllocator {
  public:
   FakePortAllocator(rtc::Thread* network_thread,
                     rtc::PacketSocketFactory* factory)
       : network_thread_(network_thread), factory_(factory) {
     if (factory_ == NULL) {
       owned_factory_.reset(new rtc::BasicPacketSocketFactory(network_thread_));
       factory_ = owned_factory_.get();
     }
-    ipv6_enabled_ = rtc::HasIPv6Enabled();
   }
 
   void Initialize() override {
     // Port allocator should be initialized on the network thread.
     RTC_CHECK(network_thread_->IsCurrent());
     initialized_ = true;
   }
 
   void SetNetworkIgnoreMask(int network_ignore_mask) override {}
 
-  // Sometimes we can ignore the value returned by rtc::HasIpv6Enabled because
-  // we are using the virtual socket server.
-  void set_ipv6_enabled(bool ipv6_enabled) { ipv6_enabled_ = ipv6_enabled; }
-
   cricket::PortAllocatorSession* CreateSessionInternal(
       const std::string& content_name,
       int component,
       const std::string& ice_ufrag,
       const std::string& ice_pwd) override {
     return new FakePortAllocatorSession(this, network_thread_, factory_,
                                         content_name, component, ice_ufrag,
-                                        ice_pwd, ipv6_enabled_);
+                                        ice_pwd);
   }
 
   bool initialized() const { return initialized_; }
 
  private:
   rtc::Thread* network_thread_;
   rtc::PacketSocketFactory* factory_;
   std::unique_ptr<rtc::BasicPacketSocketFactory> owned_factory_;
   bool initialized_ = false;
-  bool ipv6_enabled_ = false;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_FAKEPORTALLOCATOR_H_