Adding PortAllocator option to support cases where sockets can't be bound.

webrtc/p2p/base/p2ptransportchannel.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 1335 matching lines @@
 void P2PTransportChannel::PruneConnections() {
   // We can prune any connection for which there is a connected, writable
   // connection on the same network with better or equal priority.  We leave
   // those with better priority just in case they become writable later (at
   // which point, we would prune out the current selected connection).  We leave
   // connections on other networks because they may not be using the same
   // resources and they may represent very distinct paths over which we can
   // switch. If |best_conn_on_network| is not connected, we may be reconnecting
   // a TCP connection and should not prune connections in this network.
   // See the big comment in CompareConnectionStates.
+  //
+  // An exception is made for connections on an "any address" network, meaning
+  // not bound to any specific network interface. We don't want to keep one of
+  // these alive as a backup, since it could be using the same network
+  // interface as the higher-priority, selected candidate pair.
   auto best_connection_by_network = GetBestConnectionByNetwork();
   for (Connection* conn : connections_) {
-    // Do not prune connections if the current best connection on this network
-    // is weak. Otherwise, it may delete connections prematurely.
-    Connection* best_conn_on_network =
-        best_connection_by_network[conn->port()->Network()];
-    if (best_conn_on_network && conn != best_conn_on_network &&
-        !best_conn_on_network->weak() &&
-        CompareConnectionCandidates(best_conn_on_network, conn) >= 0) {
+    // Compare aainst the best connection across all networks for a connection
+    // on an "any address" network, and otherwise compare only against the
+    // per-network best connection, to ensure one connection per network stays
+    // active.
+    Connection* to_compare;
+    if (rtc::IPIsAny(conn->port()->Network()->ip())) {
+      to_compare = selected_connection_;
+    } else {
+      to_compare = best_connection_by_network[conn->port()->Network()];
+    }
+    // Do not prune connections if the connection being compared against is
+    // weak. Otherwise, it may delete connections prematurely.
+    if (to_compare && conn != to_compare && !to_compare->weak() &&
+        CompareConnectionCandidates(to_compare, conn) >= 0) {
       conn->Prune();
     }
   }
 }
 
 // Change the selected connection, and let listeners know.
 void P2PTransportChannel::SwitchSelectedConnection(Connection* conn) {
   // Note: if conn is NULL, the previous |selected_connection_| has been
   // destroyed, so don't use it.
   Connection* old_selected_connection = selected_connection_;
@@ skipping 674 matching lines @@
 
 void P2PTransportChannel::set_receiving(bool receiving) {
   if (receiving_ == receiving) {
     return;
   }
   receiving_ = receiving;
   SignalReceivingState(this);
 }
 
 }  // namespace cricket