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

Change from talk/p2p (r7572): "Improve the logging when a TCP connection is deleted."

Browse Source 
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
This commit is contained in:
henrike@webrtc.org 2014-11-10 19:40:29 +00:00
parent 4ffc7341ca
commit 43e033e778
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
}

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

@ -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);
}