Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-06-02 07:22:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: make Transport::ReceivedBytes just return success/fail

Browse Source
This commit is contained in:
Pieter Wuille 2023-07-29 13:59:35 -04:00
parent bb4aab90fd
commit 8a3b6f3387
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/net.cpp
View File

@ -690,9 +690,8 @@ bool CNode::ReceiveMsgBytes(Span<const uint8_t> msg_bytes, bool& complete)
nRecvBytes += msg_bytes.size(); nRecvBytes += msg_bytes.size();
while (msg_bytes.size() > 0) { while (msg_bytes.size() > 0) {
// absorb network data // absorb network data
int handled = m_transport->ReceivedBytes(msg_bytes); if (!m_transport->ReceivedBytes(msg_bytes)) {
if (handled < 0) { // Serious transport problem, disconnect from the peer.
// Serious header problem, disconnect from the peer.
return false; return false;
} }

23
src/net.h
View File

@ -268,9 +268,22 @@ public:
virtual bool ReceivedMessageComplete() const = 0; virtual bool ReceivedMessageComplete() const = 0;
/** Set the deserialization context version for objects returned by GetReceivedMessage. */ /** Set the deserialization context version for objects returned by GetReceivedMessage. */
virtual void SetReceiveVersion(int version) = 0; virtual void SetReceiveVersion(int version) = 0;
/** Feed wire bytes to the transport; chops off consumed bytes off front of msg_bytes. */
virtual int ReceivedBytes(Span<const uint8_t>& msg_bytes) = 0; /** Feed wire bytes to the transport.
/** Retrieve a completed message from transport (only when ReceivedMessageComplete). */ *
* @return false if some bytes were invalid, in which case the transport can't be used anymore.
*
* Consumed bytes are chopped off the front of msg_bytes.
*/
virtual bool ReceivedBytes(Span<const uint8_t>& msg_bytes) = 0;
/** Retrieve a completed message from transport.
*
* This can only be called when ReceivedMessageComplete() is true.
*
* If reject_message=true is returned the message itself is invalid, but (other than false
* returned by ReceivedBytes) the transport is not in an inconsistent state.
*/
virtual CNetMessage GetReceivedMessage(std::chrono::microseconds time, bool& reject_message) = 0; virtual CNetMessage GetReceivedMessage(std::chrono::microseconds time, bool& reject_message) = 0;
// 2. Sending side functions, for converting messages into bytes to be sent over the wire. // 2. Sending side functions, for converting messages into bytes to be sent over the wire.
@ -387,7 +400,7 @@ public:
vRecv.SetVersion(nVersionIn); vRecv.SetVersion(nVersionIn);
} }
int ReceivedBytes(Span<const uint8_t>& msg_bytes) override EXCLUSIVE_LOCKS_REQUIRED(!m_recv_mutex) bool ReceivedBytes(Span<const uint8_t>& msg_bytes) override EXCLUSIVE_LOCKS_REQUIRED(!m_recv_mutex)
{ {
AssertLockNotHeld(m_recv_mutex); AssertLockNotHeld(m_recv_mutex);
LOCK(m_recv_mutex); LOCK(m_recv_mutex);
@ -397,7 +410,7 @@ public:
} else { } else {
msg_bytes = msg_bytes.subspan(ret); msg_bytes = msg_bytes.subspan(ret);
} }
return ret; return ret >= 0;
} }
CNetMessage GetReceivedMessage(std::chrono::microseconds time, bool& reject_message) override EXCLUSIVE_LOCKS_REQUIRED(!m_recv_mutex); CNetMessage GetReceivedMessage(std::chrono::microseconds time, bool& reject_message) override EXCLUSIVE_LOCKS_REQUIRED(!m_recv_mutex);

3
src/test/fuzz/p2p_transport_serialization.cpp
View File

@ -74,8 +74,7 @@ FUZZ_TARGET(p2p_transport_serialization, .init = initialize_p2p_transport_serial
mutable_msg_bytes.insert(mutable_msg_bytes.end(), payload_bytes.begin(), payload_bytes.end()); mutable_msg_bytes.insert(mutable_msg_bytes.end(), payload_bytes.begin(), payload_bytes.end());
Span<const uint8_t> msg_bytes{mutable_msg_bytes}; Span<const uint8_t> msg_bytes{mutable_msg_bytes};
while (msg_bytes.size() > 0) { while (msg_bytes.size() > 0) {
const int handled = recv_transport.ReceivedBytes(msg_bytes); if (!recv_transport.ReceivedBytes(msg_bytes)) {
if (handled < 0) {
break; break;
} }
if (recv_transport.ReceivedMessageComplete()) { if (recv_transport.ReceivedMessageComplete()) {