When doing DisableEquivalentPhases, exclude those AllocationSequences

webrtc/p2p/client/basicportallocator.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 280 matching lines @@
   network_thread_->Post(this, MSG_ALLOCATE);
 }
 
 void BasicPortAllocatorSession::OnAllocate() {
   if (network_manager_started_)
     DoAllocate();
 
   allocation_started_ = true;
 }
 
+void BasicPortAllocatorSession::GetNetworks(
+    std::vector<rtc::Network*>* networks) {
+  networks->clear();
+  rtc::NetworkManager* network_manager = allocator_->network_manager();
+  ASSERT(network_manager);
+  // If the network permission state is BLOCKED, we just act as if the flag has
+  // been passed in.
+  if (network_manager->enumeration_permission() ==
+      rtc::NetworkManager::ENUMERATION_BLOCKED) {
+    set_flags(flags() | PORTALLOCATOR_DISABLE_ADAPTER_ENUMERATION);
+  }
+  // If the adapter enumeration is disabled, we'll just bind to any address
+  // instead of specific NIC. This is to ensure the same routing for http
+  // traffic by OS is also used here to avoid any local or public IP leakage
+  // during stun process.
+  if (flags() & PORTALLOCATOR_DISABLE_ADAPTER_ENUMERATION) {
+    network_manager->GetAnyAddressNetworks(networks);
+  } else {
+    network_manager->GetNetworks(networks);
+  }
+}
+
 // For each network, see if we have a sequence that covers it already.  If not,
 // create a new sequence to create the appropriate ports.
 void BasicPortAllocatorSession::DoAllocate() {
   bool done_signal_needed = false;
   std::vector<rtc::Network*> networks;
+  GetNetworks(&networks);
 
-  // If the network permission state is BLOCKED, we just act as if the flag has
-  // been passed in.
-  if (allocator_->network_manager()->enumeration_permission() ==
-      rtc::NetworkManager::ENUMERATION_BLOCKED) {
-    set_flags(flags() | PORTALLOCATOR_DISABLE_ADAPTER_ENUMERATION);
-  }
-
-  // If the adapter enumeration is disabled, we'll just bind to any address
-  // instead of specific NIC. This is to ensure the same routing for http
-  // traffic by OS is also used here to avoid any local or public IP leakage
-  // during stun process.
-  if (flags() & PORTALLOCATOR_DISABLE_ADAPTER_ENUMERATION) {
-    allocator_->network_manager()->GetAnyAddressNetworks(&networks);
-  } else {
-    allocator_->network_manager()->GetNetworks(&networks);
-  }
   if (networks.empty()) {
     LOG(LS_WARNING) << "Machine has no networks; no ports will be allocated";
     done_signal_needed = true;
   } else {
     for (uint32 i = 0; i < networks.size(); ++i) {
       PortConfiguration* config = NULL;
       if (configs_.size() > 0)
         config = configs_.back();
 
       uint32 sequence_flags = flags();
@@ skipping 37 matching lines @@
         sequence->Start();
       sequences_.push_back(sequence);
     }
   }
   if (done_signal_needed) {
     network_thread_->Post(this, MSG_SEQUENCEOBJECTS_CREATED);
   }
 }
 
 void BasicPortAllocatorSession::OnNetworksChanged() {
+  std::vector<rtc::Network*> networks;
+  GetNetworks(&networks);
+  for (AllocationSequence* sequence : sequences_) {
+    // If the network in the sequence has been removed, terminate the
+    // sequence: stop the allocation and clear the ports.
+    if (std::find(networks.begin(), networks.end(), sequence->network()) ==
+        networks.end()) {
+      sequence->Terminate();
+    }
+  }
+
   network_manager_started_ = true;
   if (allocation_started_)
     DoAllocate();
 }
 
 void BasicPortAllocatorSession::DisableEquivalentPhases(
     rtc::Network* network, PortConfiguration* config, uint32* flags) {
   for (uint32 i = 0; i < sequences_.size() &&
       (*flags & DISABLE_ALL_PHASES) != DISABLE_ALL_PHASES; ++i) {
-    sequences_[i]->DisableEquivalentPhases(network, config, flags);
+    AllocationSequence* sequence = sequences_[i];
+    if (!sequence->IsTerminated()) {

[pthatcher1, 2015/09/24 17:11:43]

Can we just make DisableEquivalentPhases check to see if it's terminated and
then no-op?  Then we don't have to check it at every call site.

[honghaiz3, 2015/09/24 19:26:59]

Done.

+      sequence->DisableEquivalentPhases(network, config, flags);
+    }
   }
 }
 
 void BasicPortAllocatorSession::AddAllocatedPort(Port* port,
                                                  AllocationSequence * seq,
                                                  bool prepare_address) {
   if (!port)
     return;
 
   LOG(LS_INFO) << "Adding allocated port for " << content_name();
@@ skipping 304 matching lines @@
     // are next available options to setup a communication channel.
   }
   return true;
 }
 
 void AllocationSequence::Clear() {
   udp_port_ = NULL;
   turn_ports_.clear();
 }
 
+void AllocationSequence::Terminate() {

[pthatcher1, 2015/09/24 17:11:43]

How is this much different than calling Clear()?  Why do we have both?

[honghaiz3, 2015/09/24 19:26:59]

Removed the state. 

+  state_ = kTerminated;
+  Clear();
+  session_->network_thread()->Clear(this);
+}
+
 AllocationSequence::~AllocationSequence() {
   session_->network_thread()->Clear(this);
 }
 
 void AllocationSequence::DisableEquivalentPhases(rtc::Network* network,
     PortConfiguration* config, uint32* flags) {
   if (!((network == network_) && (ip_ == network->GetBestIP()))) {
     // Different network setup; nothing is equivalent.
     return;
   }
@@ skipping 416 matching lines @@
   ServerAddresses servers;
   for (size_t i = 0; i < relays.size(); ++i) {
     if (relays[i].type == turn_type && SupportsProtocol(relays[i], type)) {
       servers.insert(relays[i].ports.front().address);
     }
   }
   return servers;
 }
 
 }  // namespace cricket