Revert of Prune connections based on network name.

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 1288 matching lines @@
 
   // Also possibly start pinging.
   // We could start pinging if:
   // * The first connection was created.
   // * ICE credentials were provided.
   // * A TCP connection became connected.
   MaybeStartPinging();
 }
 
 void P2PTransportChannel::PruneConnections() {
-  // We can prune any connection for which there is a connected, writable,
-  // and receiving connection with the same network name 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 the |premier| connection is not connected,
-  // we may be reconnecting a TCP connection and temporarily do not prune
-  // connections in this network. See the big comment in
-  // CompareConnectionStates.
+  // 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 the |premier| connection is not connected, we may be
+  // reconnecting a TCP connection and temporarily do not prune connections in
+  // this network. See the big comment in CompareConnectionStates.
 
-  std::map<std::string, Connection*> premier_connection_by_network_name;
-  if (selected_connection_) {
-    // |selected_connection_| is always a premier connection.
-    const std::string& network_name =
-        selected_connection_->port()->Network()->name();
-    premier_connection_by_network_name[network_name] = selected_connection_;
+  // Get a list of the networks that we are using.
+  std::set<rtc::Network*> networks;
+  for (const Connection* conn : connections_) {
+    networks.insert(conn->port()->Network());
   }
-  for (Connection* conn : connections_) {
-    const std::string& network_name = conn->port()->Network()->name();
-    Connection* premier = premier_connection_by_network_name[network_name];
-    // Since the connections are sorted, the first one with a given network name
-    // is the premier connection for the network name.
-    // |premier| might be equal to |conn| if this is the selected connection.
-    if (premier == nullptr) {
-      premier_connection_by_network_name[network_name] = conn;
-    } else if (premier != conn && !premier->weak() &&
-               CompareConnectionCandidates(premier, conn) >= 0) {
-      conn->Prune();
+  for (rtc::Network* network : networks) {
+    Connection* premier = GetBestConnectionOnNetwork(network);
+    // Do not prune connections if the current selected connection is weak on
+    // this network. Otherwise, it may delete connections prematurely.
+    if (!premier || premier->weak()) {
+      continue;
+    }
+
+    for (Connection* conn : connections_) {
+      if ((conn != premier) && (conn->port()->Network() == network) &&
+          (CompareConnectionCandidates(premier, 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_;
   selected_connection_ = conn;
@@ skipping 117 matching lines @@
 bool P2PTransportChannel::ReadyToSend(Connection* connection) const {
   // Note that we allow sending on an unreliable connection, because it's
   // possible that it became unreliable simply due to bad chance.
   // So this shouldn't prevent attempting to send media.
   return connection != nullptr &&
          (connection->writable() ||
           connection->write_state() == Connection::STATE_WRITE_UNRELIABLE ||
           PresumedWritable(connection));
 }
 
+// If we have a selected connection, return it, otherwise return top one in the
+// list (later we will mark it best).
+Connection* P2PTransportChannel::GetBestConnectionOnNetwork(
+    rtc::Network* network) const {
+  // If the selected connection is on this network, then it wins.
+  if (selected_connection_ &&
+      (selected_connection_->port()->Network() == network)) {
+    return selected_connection_;
+  }
+
+  // Otherwise, we return the top-most in sorted order.
+  for (size_t i = 0; i < connections_.size(); ++i) {
+    if (connections_[i]->port()->Network() == network) {
+      return connections_[i];
+    }
+  }
+
+  return NULL;
+}
+
 // Handle any queued up requests
 void P2PTransportChannel::OnMessage(rtc::Message *pmsg) {
   switch (pmsg->message_id) {
     case MSG_SORT_AND_UPDATE_STATE:
       SortConnectionsAndUpdateState();
       break;
     case MSG_CHECK_AND_PING:
       OnCheckAndPing();
       break;
     case MSG_REGATHER_ON_FAILED_NETWORKS:
@@ skipping 483 matching lines @@
 
   // During the initial state when nothing has been pinged yet, return the first
   // one in the ordered |connections_|.
   return *(std::find_if(connections_.begin(), connections_.end(),
                         [conn1, conn2](Connection* conn) {
                           return conn == conn1 || conn == conn2;
                         }));
 }
 
 }  // namespace cricket