net: update misbehavior logging for oversized messages

jonatack · jonatack · commit 9fa494dc0969 · 2020-06-19T14:14:16.000+02:00
so that oversized ADDR, GETDATA, HEADERS and INV messages print
the same consistent debug logs.
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -2454,7 +2454,7 @@ void ProcessMessage(
         if (vAddr.size() > 1000)
         {
             LOCK(cs_main);
-            Misbehaving(pfrom.GetId(), 20, strprintf("message addr size() = %u", vAddr.size()));
+            Misbehaving(pfrom.GetId(), 20, strprintf("addr message size = %u", vAddr.size()));
             return;
         }
 
@@ -2530,7 +2530,7 @@ void ProcessMessage(
         if (vInv.size() > MAX_INV_SZ)
         {
             LOCK(cs_main);
-            Misbehaving(pfrom.GetId(), 20, strprintf("message inv size() = %u", vInv.size()));
+            Misbehaving(pfrom.GetId(), 20, strprintf("inv message size = %u", vInv.size()));
             return;
         }
 
@@ -2596,7 +2596,7 @@ void ProcessMessage(
         if (vInv.size() > MAX_INV_SZ)
         {
             LOCK(cs_main);
-            Misbehaving(pfrom.GetId(), 20, strprintf("message getdata size() = %u", vInv.size()));
+            Misbehaving(pfrom.GetId(), 20, strprintf("getdata message size = %u", vInv.size()));
             return;
         }
 
diff --git a/test/functional/p2p_addr_relay.py b/test/functional/p2p_addr_relay.py
@@ -49,9 +49,9 @@ def run_test(self):
         addr_source = self.nodes[0].add_p2p_connection(P2PInterface())
         msg = msg_addr()
 
-        self.log.info('Send too large addr message')
+        self.log.info('Send too-large addr message')
         msg.addrs = ADDRS * 101
-        with self.nodes[0].assert_debug_log(['message addr size() = 1010']):
+        with self.nodes[0].assert_debug_log(['addr message size = 1010']):
             addr_source.send_and_ping(msg)
 
         self.log.info('Check that addr message content is relayed and added to addrman')
diff --git a/test/functional/p2p_invalid_messages.py b/test/functional/p2p_invalid_messages.py
@@ -121,10 +121,10 @@ def test_msgtype(self):
 
     def test_large_inv(self):
         conn = self.nodes[0].add_p2p_connection(P2PInterface())
-        with self.nodes[0].assert_debug_log(['Misbehaving', '(0 -> 20): message inv size() = 50001']):
+        with self.nodes[0].assert_debug_log(['Misbehaving', '(0 -> 20): inv message size = 50001']):
             msg = msg_inv([CInv(MSG_TX, 1)] * 50001)
             conn.send_and_ping(msg)
-        with self.nodes[0].assert_debug_log(['Misbehaving', '(20 -> 40): message getdata size() = 50001']):
+        with self.nodes[0].assert_debug_log(['Misbehaving', '(20 -> 40): getdata message size = 50001']):
             msg = msg_getdata([CInv(MSG_TX, 1)] * 50001)
             conn.send_and_ping(msg)
         with self.nodes[0].assert_debug_log(['Misbehaving', '(40 -> 60): headers message size = 2001']):

Original file line number	Diff line number	Diff line change
`@@ -2454,7 +2454,7 @@ void ProcessMessage(`
`2454`	`2454`	`if (vAddr.size() > 1000)`
`2455`	`2455`	`{`
`2456`	`2456`	`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()));`
`2458`	`2458`	`return;`
`2459`	`2459`	`}`
`2460`	`2460`
`@@ -2530,7 +2530,7 @@ void ProcessMessage(`
`2530`	`2530`	`if (vInv.size() > MAX_INV_SZ)`
`2531`	`2531`	`{`
`2532`	`2532`	`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()));`
`2534`	`2534`	`return;`
`2535`	`2535`	`}`
`2536`	`2536`
`@@ -2596,7 +2596,7 @@ void ProcessMessage(`
`2596`	`2596`	`if (vInv.size() > MAX_INV_SZ)`
`2597`	`2597`	`{`
`2598`	`2598`	`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()));`
`2600`	`2600`	`return;`
`2601`	`2601`	`}`
`2602`	`2602`