From 43e033e7785fff6815fb2154cee87af893fe47a4 Mon Sep 17 00:00:00 2001 From: "henrike@webrtc.org" Date: Mon, 10 Nov 2014 19:40:29 +0000 Subject: [PATCH] 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@7673 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/p2p/base/port.cc | 2 +- webrtc/p2p/base/tcpport.cc | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/webrtc/p2p/base/port.cc b/webrtc/p2p/base/port.cc index a8357ad6bb..d71d6fa844 100644 --- a/webrtc/p2p/base/port.cc +++ b/webrtc/p2p/base/port.cc @@ -1327,7 +1327,7 @@ void Connection::HandleRoleConflictFromPeer() { void Connection::OnMessage(rtc::Message *pmsg) { ASSERT(pmsg->message_id == MSG_DELETE); - LOG_J(LS_INFO, this) << "Connection deleted"; + LOG_J(LS_INFO, this) << "Connection deleted due to read or write timeout"; SignalDestroyed(this); delete this; } diff --git a/webrtc/p2p/base/tcpport.cc b/webrtc/p2p/base/tcpport.cc index b37f4d3ff1..c5891f2869 100644 --- a/webrtc/p2p/base/tcpport.cc +++ b/webrtc/p2p/base/tcpport.cc @@ -291,20 +291,23 @@ void TCPConnection::OnConnect(rtc::AsyncPacketSocket* socket) { // 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); }