commit 50ca986bc19e5a6ee7e7f6265dab8558bea979a3
author jiayl@webrtc.org <jiayl@webrtc.org> Thu Oct 30 23:50:54 2014 +0000
committer jiayl@webrtc.org <jiayl@webrtc.org> Thu Oct 30 23:50:54 2014 +0000
tree 9b31481e81e8988ded78c4913002ca8722b310be
parent d0cf68ee376cf9416c588d00207f34c78a926223

Improve the logging when a TCP connection is deleted.

BUG=
R=juberti@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/31869004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7572 4adac7df-926f-26a2-2b94-8c16560cd09d

talk/p2p/base/port.cc

diff --git a/talk/p2p/base/port.cc b/talk/p2p/base/port.cc
index 7ce01b5..aa88872 100644
--- a/talk/p2p/base/port.cc
+++ b/talk/p2p/base/port.cc
@@ -1337,7 +1337,7 @@
 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;
 }

talk/p2p/base/tcpport.cc

diff --git a/talk/p2p/base/tcpport.cc b/talk/p2p/base/tcpport.cc
index 30c28c9..aa08a92 100644
--- a/talk/p2p/base/tcpport.cc
+++ b/talk/p2p/base/tcpport.cc
@@ -304,20 +304,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);
 }