Change from talk/p2p (r7572): "Improve the logging when a TCP connection is deleted."
BUG=3379
R=jiayl@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/27109004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@7673 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/p2p/base/tcpport.cc b/p2p/base/tcpport.cc
index b37f4d3..c5891f2 100644
--- a/p2p/base/tcpport.cc
+++ b/p2p/base/tcpport.cc
@@ -291,20 +291,23 @@
// 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.
- if (socket->GetLocalAddress().ipaddr() == port()->ip()) {
+ 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);
} else {
- LOG_J(LS_WARNING, this) << "Dropping connection as TCP socket bound to a "
- << "different address from the local candidate.";
+ LOG_J(LS_WARNING, this) << "Dropping connection as TCP socket bound to IP "
+ << socket_ip.ToSensitiveString()
+ << ", different from the local candidate IP "
+ << port()->ip().ToSensitiveString();
socket_->Close();
}
}
void TCPConnection::OnClose(rtc::AsyncPacketSocket* socket, int error) {
ASSERT(socket == socket_);
- LOG_J(LS_VERBOSE, this) << "Connection closed with error " << error;
+ LOG_J(LS_INFO, this) << "Connection closed with error " << error;
set_connected(false);
set_write_state(STATE_WRITE_TIMEOUT);
}
