mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net_processing: Add missing use of DisconnectMsg

Browse Source 
Makes it easier to grep logs for "disconnecting" when investigating disconnections.
This commit is contained in:
Hodlinator committed 2025-01-10 11:25:08 +01:00
1 parent 37af8bfb34
commit 0c4954ac7d
2 files changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/net_processing.cpp
+2 -2
View File
@@ -4205,7 +4205,7 @@ void PeerManagerImpl::ProcessMessage(CNode& pfrom, const std::string& msg_type,
if (msg_type == NetMsgType::TX) { if (msg_type == NetMsgType::TX) {
if (RejectIncomingTxs(pfrom)) { if (RejectIncomingTxs(pfrom)) {
LogDebug(BCLog::NET, "transaction sent in violation of protocol peer=%d\n", pfrom.GetId()); LogDebug(BCLog::NET, "transaction sent in violation of protocol, %s", pfrom.DisconnectMsg(fLogIPs));
pfrom.fDisconnect = true; pfrom.fDisconnect = true;
return; return;
} }
@@ -5207,7 +5207,7 @@ void PeerManagerImpl::MaybeSendPing(CNode& node_to, Peer& peer, std::chrono::mic
{ {
// The ping timeout is using mocktime. To disable the check during // The ping timeout is using mocktime. To disable the check during
// testing, increase -peertimeout. // testing, increase -peertimeout.
LogDebug(BCLog::NET, "ping timeout: %fs peer=%d\n", 0.000001 * count_microseconds(now - peer.m_ping_start.load()), peer.m_id); LogDebug(BCLog::NET, "ping timeout: %fs, %s", 0.000001 * count_microseconds(now - peer.m_ping_start.load()), node_to.DisconnectMsg(fLogIPs));
node_to.fDisconnect = true; node_to.fDisconnect = true;
return; return;
} }
test/functional/p2p_blocksonly.py
+1 -1
View File
@@ -115,7 +115,7 @@ class P2PBlocksOnly(BitcoinTestFramework):
self.log.info('Check that txs from P2P are rejected and result in disconnect') self.log.info('Check that txs from P2P are rejected and result in disconnect')
spendtx = self.miniwallet.create_self_transfer() spendtx = self.miniwallet.create_self_transfer()
with self.nodes[0].assert_debug_log(['transaction sent in violation of protocol peer=0']): with self.nodes[0].assert_debug_log(['transaction sent in violation of protocol, disconnecting peer=0']):
self.nodes[0].p2ps[0].send_message(msg_tx(spendtx['tx'])) self.nodes[0].p2ps[0].send_message(msg_tx(spendtx['tx']))
self.nodes[0].p2ps[0].wait_for_disconnect() self.nodes[0].p2ps[0].wait_for_disconnect()
assert_equal(self.nodes[0].getmempoolinfo()['size'], 0) assert_equal(self.nodes[0].getmempoolinfo()['size'], 0)