Revert of Allow the localhost IP address even if it does not match the tcp port address

webrtc/p2p/base/tcpport.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 369 matching lines @@
   pretending_to_be_writable_ = false;
   ASSERT(write_state() == STATE_WRITABLE);
 }
 
 void TCPConnection::OnConnect(rtc::AsyncPacketSocket* socket) {
   ASSERT(socket == socket_.get());
   // Do not use this connection if the socket bound to a different address than
   // the one we asked for. This is seen in Chrome, where TCP sockets cannot be
   // given a binding address, and the platform is expected to pick the
   // correct local address.
-  const rtc::SocketAddress& socket_addr = socket->GetLocalAddress();
-  if (socket_addr.ipaddr() == port()->ip()) {
-    LOG_J(LS_VERBOSE, this) << "Connection established to "
-                            << socket->GetRemoteAddress().ToSensitiveString();
-  } else if (IPIsAny(port()->ip())) {
-    LOG(LS_WARNING) << "Socket is bound to a different address:"
-                    << socket_addr.ipaddr().ToString()
-                    << ", rather then the local port:"
-                    << port()->ip().ToString()
-                    << ". Still allowing it since it's any address"
-                    << ", possibly caused by multi-routes being disabled.";
-  } else if (socket_addr.IsLoopbackIP()) {
-    LOG(LS_WARNING) << "Socket is bound to a different address:"
-                    << socket_addr.ipaddr().ToString()
-                    << ", rather then the local port:"
-                    << port()->ip().ToString()
-                    << ". Still allowing it since it's localhost.";
+  const rtc::IPAddress& socket_ip = socket->GetLocalAddress().ipaddr();
+  if (socket_ip == port()->ip() || IPIsAny(port()->ip())) {
+    if (socket_ip == port()->ip()) {
+      LOG_J(LS_VERBOSE, this) << "Connection established to "
+                              << socket->GetRemoteAddress().ToSensitiveString();
+    } else {
+      LOG(LS_WARNING) << "Socket is bound to a different address:"
+                      << socket->GetLocalAddress().ipaddr().ToString()
+                      << ", rather then the local port:"
+                      << port()->ip().ToString()
+                      << ". Still allowing it since it's any address"
+                      << ", possibly caused by multi-routes being disabled.";
+    }
+    set_connected(true);
+    connection_pending_ = false;
   } else {
     LOG_J(LS_WARNING, this) << "Dropping connection as TCP socket bound to IP "
-                            << socket_addr.ipaddr().ToSensitiveString()
+                            << socket_ip.ToSensitiveString()
                             << ", different from the local candidate IP "
                             << port()->ip().ToSensitiveString();
     OnClose(socket, 0);
-    return;
   }
-
-  // Connection is established successfully.
-  set_connected(true);
-  connection_pending_ = false;
 }
 
 void TCPConnection::OnClose(rtc::AsyncPacketSocket* socket, int error) {
   ASSERT(socket == socket_.get());
   LOG_J(LS_INFO, this) << "Connection closed with error " << error;
 
   // Guard against the condition where IPC socket will call OnClose for every
   // packet it can't send.
   if (connected()) {
     set_connected(false);
@@ skipping 83 matching lines @@
 void TCPConnection::ConnectSocketSignals(rtc::AsyncPacketSocket* socket) {
   if (outgoing_) {
     socket->SignalConnect.connect(this, &TCPConnection::OnConnect);
   }
   socket->SignalReadPacket.connect(this, &TCPConnection::OnReadPacket);
   socket->SignalReadyToSend.connect(this, &TCPConnection::OnReadyToSend);
   socket->SignalClose.connect(this, &TCPConnection::OnClose);
 }
 
 }  // namespace cricket