Skip to content

Commit 9fa494d

Browse files
committed
net: update misbehavior logging for oversized messages
so that oversized ADDR, GETDATA, HEADERS and INV messages print the same consistent debug logs.
1 parent 5f72ddb commit 9fa494d

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/net_processing.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2454,7 +2454,7 @@ void ProcessMessage(
24542454
if (vAddr.size() > 1000)
24552455
{
24562456
LOCK(cs_main);
2457-
Misbehaving(pfrom.GetId(), 20, strprintf("message addr size() = %u", vAddr.size()));
2457+
Misbehaving(pfrom.GetId(), 20, strprintf("addr message size = %u", vAddr.size()));
24582458
return;
24592459
}
24602460

@@ -2530,7 +2530,7 @@ void ProcessMessage(
25302530
if (vInv.size() > MAX_INV_SZ)
25312531
{
25322532
LOCK(cs_main);
2533-
Misbehaving(pfrom.GetId(), 20, strprintf("message inv size() = %u", vInv.size()));
2533+
Misbehaving(pfrom.GetId(), 20, strprintf("inv message size = %u", vInv.size()));
25342534
return;
25352535
}
25362536

@@ -2596,7 +2596,7 @@ void ProcessMessage(
25962596
if (vInv.size() > MAX_INV_SZ)
25972597
{
25982598
LOCK(cs_main);
2599-
Misbehaving(pfrom.GetId(), 20, strprintf("message getdata size() = %u", vInv.size()));
2599+
Misbehaving(pfrom.GetId(), 20, strprintf("getdata message size = %u", vInv.size()));
26002600
return;
26012601
}
26022602

test/functional/p2p_addr_relay.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ def run_test(self):
4949
addr_source = self.nodes[0].add_p2p_connection(P2PInterface())
5050
msg = msg_addr()
5151

52-
self.log.info('Send too large addr message')
52+
self.log.info('Send too-large addr message')
5353
msg.addrs = ADDRS * 101
54-
with self.nodes[0].assert_debug_log(['message addr size() = 1010']):
54+
with self.nodes[0].assert_debug_log(['addr message size = 1010']):
5555
addr_source.send_and_ping(msg)
5656

5757
self.log.info('Check that addr message content is relayed and added to addrman')

test/functional/p2p_invalid_messages.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,10 @@ def test_msgtype(self):
121121

122122
def test_large_inv(self):
123123
conn = self.nodes[0].add_p2p_connection(P2PInterface())
124-
with self.nodes[0].assert_debug_log(['Misbehaving', '(0 -> 20): message inv size() = 50001']):
124+
with self.nodes[0].assert_debug_log(['Misbehaving', '(0 -> 20): inv message size = 50001']):
125125
msg = msg_inv([CInv(MSG_TX, 1)] * 50001)
126126
conn.send_and_ping(msg)
127-
with self.nodes[0].assert_debug_log(['Misbehaving', '(20 -> 40): message getdata size() = 50001']):
127+
with self.nodes[0].assert_debug_log(['Misbehaving', '(20 -> 40): getdata message size = 50001']):
128128
msg = msg_getdata([CInv(MSG_TX, 1)] * 50001)
129129
conn.send_and_ping(msg)
130130
with self.nodes[0].assert_debug_log(['Misbehaving', '(40 -> 60): headers message size = 2001']):

0 commit comments

Comments
 (0)