github
/
bitcoin
mirror of https://github.com/bitcoin/bitcoin
1
Fork 0
Code Releases Activity

net: additional disconnection logging 

Use the word "disconnecting" everywhere for easier grep.
This commit is contained in:
Sjors Provoost 2024-02-27 13:10:29 +01:00
parent 6a7ed5e237
commit b8d7ce260e
No known key found for this signature in database
GPG Key ID: 57FF9BDBCC301009
2 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/net.cpp
View File

@ -1880,7 +1880,11 @@ void CConnman::DisconnectNodes()
// Disconnect any connected nodes
for (CNode* pnode : m_nodes) {
if (!pnode->fDisconnect) {
LogPrint(BCLog::NET, "Network not active, dropping peer=%d\n", pnode->GetId());
LogPrint(BCLog::NET,
"Network not active, disconnecting peer=%d%s\n",
pnode->GetId(),
fLogIPs ? strprintf(" peeraddr=%s", pnode->addr.ToStringAddrPort()) : ""
);
pnode->fDisconnect = true;
}
}
@ -1973,22 +1977,41 @@ bool CConnman::InactivityCheck(const CNode& node) const
if (!ShouldRunInactivityChecks(node, now)) return false;
if (last_recv.count() == 0 || last_send.count() == 0) {
LogPrint(BCLog::NET, "socket no message in first %i seconds, %d %d peer=%d\n", count_seconds(m_peer_connect_timeout), last_recv.count() != 0, last_send.count() != 0, node.GetId());
LogPrint(BCLog::NET,
"socket no message in first %i seconds, %d %d disconnecting peer=%d%s\n",
count_seconds(m_peer_connect_timeout),
last_recv.count() != 0,
last_send.count() != 0,
node.GetId(),
fLogIPs ? strprintf(" peeraddr=%s", node.addr.ToStringAddrPort()) : ""
);
return true;
}
if (now > last_send + TIMEOUT_INTERVAL) {
LogPrint(BCLog::NET, "socket sending timeout: %is peer=%d\n", count_seconds(now - last_send), node.GetId());
LogPrint(BCLog::NET,
"socket sending timeout: %is, disconnecting peer=%d%s\n", count_seconds(now - last_send),
node.GetId(),
fLogIPs ? strprintf(" peeraddr=%s", node.addr.ToStringAddrPort()) : ""
);
return true;
}
if (now > last_recv + TIMEOUT_INTERVAL) {
LogPrint(BCLog::NET, "socket receive timeout: %is peer=%d\n", count_seconds(now - last_recv), node.GetId());
LogPrint(BCLog::NET,
"socket receive timeout: %is, disconnecting peer=%d%s\n", count_seconds(now - last_recv),
node.GetId(),
fLogIPs ? strprintf(" peeraddr=%s", node.addr.ToStringAddrPort()) : ""
);
return true;
}
if (!node.fSuccessfullyConnected) {
LogPrint(BCLog::NET, "version handshake timeout peer=%d\n", node.GetId());
LogPrint(BCLog::NET,
"version handshake timeout, disconnecting peer=%d%s\n",
node.GetId(),
fLogIPs ? strprintf(" peeraddr=%s", node.addr.ToStringAddrPort()) : ""
);
return true;
}
@ -2115,6 +2138,11 @@ void CConnman::SocketHandlerConnected(const std::vector<CNode*>& nodes,
{
bool notify = false;
if (!pnode->ReceiveMsgBytes({pchBuf, (size_t)nBytes}, notify)) {
LogPrint(BCLog::NET,
"receiving message bytes failed for peer=%d%s\n",
pnode->GetId(),
fLogIPs ? strprintf(" peeraddr=%s", pnode->addr.ToStringAddrPort()) : ""
);
pnode->CloseSocketDisconnect();
}
RecordBytesRecv(nBytes);

12
test/functional/p2p_timeouts.py
View File

@ -84,15 +84,15 @@ class TimeoutsTest(BitcoinTestFramework):
if self.options.v2transport:
expected_timeout_logs = [
"version handshake timeout peer=0",
"version handshake timeout peer=1",
"version handshake timeout peer=2",
"version handshake timeout, disconnecting peer=0",
"version handshake timeout, disconnecting peer=1",
"version handshake timeout, disconnecting peer=2",
]
else:
expected_timeout_logs = [
"version handshake timeout peer=0",
"socket no message in first 3 seconds, 1 0 peer=1",
"socket no message in first 3 seconds, 0 0 peer=2",
"version handshake timeout, disconnecting peer=0",
"socket no message in first 3 seconds, 1 0 disconnecting peer=1",
"socket no message in first 3 seconds, 0 0 disconnecting peer=2",
]
with self.nodes[0].assert_debug_log(expected_msgs=expected_timeout_logs):