diff --git a/src/net.h b/src/net.h --- a/src/net.h +++ b/src/net.h @@ -684,8 +684,6 @@ virtual void Reset() = 0; // returns true if the current deserialization is complete virtual bool Complete() const = 0; - // checks if the potential message in deserialization is oversized - virtual bool OversizedMessageDetected(const Config &config) const = 0; // set the serialization context version virtual void SetVersion(int version) = 0; // read and deserialize data @@ -748,9 +746,6 @@ hdrbuf.SetVersion(nVersionIn); vRecv.SetVersion(nVersionIn); } - bool OversizedMessageDetected(const Config &config) const { - return (in_data && hdr.IsOversized(config)); - } int Read(const Config &config, const char *pch, uint32_t nBytes) { return in_data ? readData(pch, nBytes) : readHeader(config, pch, nBytes); diff --git a/src/net.cpp b/src/net.cpp --- a/src/net.cpp +++ b/src/net.cpp @@ -586,14 +586,6 @@ return false; } - if (m_deserializer->OversizedMessageDetected(config)) { - LogPrint(BCLog::NET, - "Oversized message from peer=%i, disconnecting\n", - GetId()); - m_deserializer->Reset(); - return false; - } - pch += handled; nBytes -= handled; diff --git a/test/functional/p2p_invalid_messages.py b/test/functional/p2p_invalid_messages.py --- a/test/functional/p2p_invalid_messages.py +++ b/test/functional/p2p_invalid_messages.py @@ -92,11 +92,10 @@ msg_over_size = msg_unrecognized(str_data="b" * (valid_data_limit + 1)) assert len(msg_over_size.serialize()) == (msg_limit + 1) - with node.assert_debug_log(["Oversized header detected"]): - # An unknown message type (or *any* message type) over - # MAX_PROTOCOL_MESSAGE_LENGTH should result in a disconnect. - node.p2p.send_message(msg_over_size) - node.p2p.wait_for_disconnect(timeout=4) + # An unknown message type (or *any* message type) over + # MAX_PROTOCOL_MESSAGE_LENGTH should result in a disconnect. + node.p2p.send_message(msg_over_size) + node.p2p.wait_for_disconnect(timeout=4) node.disconnect_p2ps() conn = node.add_p2p_connection(P2PDataStore())