From 2e4b620471efdd913e2d9975b9d0b49b3e50f3a7 Mon Sep 17 00:00:00 2001 From: Guo-wei Shieh Date: Wed, 23 Sep 2015 13:57:07 -0700 Subject: [PATCH] TcpPort doesn't connect when calling gmail with non-proxied UDP disabled. The same check has been made into turnport.cc but missed this place. BUG=webrtc:5030 R=pthatcher@webrtc.org Review URL: https://codereview.webrtc.org/1367553002 . Cr-Commit-Position: refs/heads/master@{#10038} --- webrtc/p2p/base/tcpport.cc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/webrtc/p2p/base/tcpport.cc b/webrtc/p2p/base/tcpport.cc index 8fcbfe3cdf..acaa6404cb 100644 --- a/webrtc/p2p/base/tcpport.cc +++ b/webrtc/p2p/base/tcpport.cc @@ -379,6 +379,15 @@ void TCPConnection::OnConnect(rtc::AsyncPacketSocket* socket) { << socket->GetRemoteAddress().ToSensitiveString(); set_connected(true); connection_pending_ = false; + } else if (IPIsAny(port()->ip())) { + 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_ip.ToSensitiveString()