generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve the logging when a TCP connection is deleted.

Browse Source 
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
This commit is contained in:
jiayl@webrtc.org 2014-10-30 23:50:54 +00:00
parent d0cf68ee37
commit 50ca986bc1
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
talk/p2p/base/port.cc
View File

@ -1337,7 +1337,7 @@ void Connection::HandleRoleConflictFromPeer() {
void Connection::OnMessage(rtc::Message *pmsg) { void Connection::OnMessage(rtc::Message *pmsg) {
ASSERT(pmsg->message_id == MSG_DELETE); 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); SignalDestroyed(this);
delete this; delete this;
} }

11
talk/p2p/base/tcpport.cc
View File

@ -304,20 +304,23 @@ void TCPConnection::OnConnect(rtc::AsyncPacketSocket* socket) {
// the one we asked for. This is seen in Chrome, where TCP sockets cannot be // 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 // given a binding address, and the platform is expected to pick the
// correct local address. // 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 " LOG_J(LS_VERBOSE, this) << "Connection established to "
<< socket->GetRemoteAddress().ToSensitiveString(); << socket->GetRemoteAddress().ToSensitiveString();
set_connected(true); set_connected(true);
} else { } else {
LOG_J(LS_WARNING, this) << "Dropping connection as TCP socket bound to a " LOG_J(LS_WARNING, this) << "Dropping connection as TCP socket bound to IP "
<< "different address from the local candidate."; << socket_ip.ToSensitiveString()
<< ", different from the local candidate IP "
<< port()->ip().ToSensitiveString();
socket_->Close(); socket_->Close();
} }
} }
void TCPConnection::OnClose(rtc::AsyncPacketSocket* socket, int error) { void TCPConnection::OnClose(rtc::AsyncPacketSocket* socket, int error) {
ASSERT(socket == socket_); 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_connected(false);
set_write_state(STATE_WRITE_TIMEOUT); set_write_state(STATE_WRITE_TIMEOUT);
} }