Move the concept of multiple route into Network

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 286 matching lines @@
 
   allocation_started_ = true;
 }
 
 // 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;
 
+  // SignalNetworksChanged should have been fired when we are here.
+  DCHECK(allocator_->network_manager()->network_permission_state() !=
+         rtc::NetworkManager::STATE_UNKNOWN);
+
+  // If the network permission state is BLOCKED, we just act as if the flag has
+  // been passed in.
+  if (allocator_->network_manager()->network_permission_state() ==
+      rtc::NetworkManager::STATE_BLOCKED) {

[pthatcher1, 2015/08/18 18:34:20]

In a release build, we would grant access if in the STATE_UNKNOWN.  I think it
would be safer to test "!= ALLOWED" rather than "== BLOCKED".

+    set_flags(flags() | PORTALLOCATOR_DISABLE_ADAPTER_ENUMERATION);

[pthatcher1, 2015/08/18 18:34:20]

So what if the the permission changes?  Should we have a signal that listens to
that and starts enumeration after it changes?

+  }

[pthatcher1, 2015/08/18 18:47:59]

Can you add a unit test for this?

+
   // 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()) {
@@ skipping 810 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