admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Address the comment from 1367553002.

Browse Source 
Remove duplication introduced by
https://codereview.webrtc.org/1367553002

BUG=webrtc:5030
TBR=juberti@webrtc.org

Review URL: https://codereview.webrtc.org/1360203003 .

Cr-Commit-Position: refs/heads/master@{#10039}
This commit is contained in:
Guo-wei Shieh 2015-09-23 14:09:09 -07:00
parent 2e4b620471
commit 53eee43e78
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
webrtc/p2p/base/tcpport.cc
View File

@ -374,18 +374,18 @@ void TCPConnection::OnConnect(rtc::AsyncPacketSocket* socket) {
// given a binding address, and the platform is expected to pick the
// correct local address.
const rtc::IPAddress& socket_ip = socket->GetLocalAddress().ipaddr();
if (socket_ip == port()->ip()) {
LOG_J(LS_VERBOSE, this) << "Connection established to "
<< 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.";
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 {