highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-13 07:28:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make resetting implicit in TransportDeserializer::Read()

Browse Source
This commit is contained in:
Pieter Wuille
2019-10-18 12:03:13 -07:00
committed by Jonas Schnelli
parent 6a91499496
commit f342a5e61a
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/net.cpp
View File

@@ -572,10 +572,7 @@ bool CNode::ReceiveMsgBytes(const char *pch, unsigned int nBytes, bool& complete
while (nBytes > 0) { while (nBytes > 0) {
// absorb network data // absorb network data
int handled = m_deserializer->Read(pch, nBytes); int handled = m_deserializer->Read(pch, nBytes);
if (handled < 0) { if (handled < 0) return false;
m_deserializer->Reset();
return false;
}
pch += handled; pch += handled;
nBytes -= handled; nBytes -= handled;

18
src/net.h
View File

@@ -638,8 +638,6 @@ public:
*/ */
class TransportDeserializer { class TransportDeserializer {
public: public:
// prepare for next message
virtual void Reset() = 0;
// returns true if the current deserialization is complete // returns true if the current deserialization is complete
virtual bool Complete() const = 0; virtual bool Complete() const = 0;
// set the serialization context version // set the serialization context version
@@ -666,11 +664,6 @@ private:
const uint256& GetMessageHash() const; const uint256& GetMessageHash() const;
int readHeader(const char *pch, unsigned int nBytes); int readHeader(const char *pch, unsigned int nBytes);
int readData(const char *pch, unsigned int nBytes); int readData(const char *pch, unsigned int nBytes);
public:
V1TransportDeserializer(const CMessageHeader::MessageStartChars& pchMessageStartIn, int nTypeIn, int nVersionIn) : hdrbuf(nTypeIn, nVersionIn), hdr(pchMessageStartIn), vRecv(nTypeIn, nVersionIn) {
Reset();
}
void Reset() { void Reset() {
vRecv.clear(); vRecv.clear();
@@ -682,6 +675,13 @@ public:
data_hash.SetNull(); data_hash.SetNull();
hasher.Reset(); hasher.Reset();
} }
public:
V1TransportDeserializer(const CMessageHeader::MessageStartChars& pchMessageStartIn, int nTypeIn, int nVersionIn) : hdrbuf(nTypeIn, nVersionIn), hdr(pchMessageStartIn), vRecv(nTypeIn, nVersionIn) {
Reset();
}
bool Complete() const bool Complete() const
{ {
if (!in_data) if (!in_data)
@@ -694,7 +694,9 @@ public:
vRecv.SetVersion(nVersionIn); vRecv.SetVersion(nVersionIn);
} }
int Read(const char *pch, unsigned int nBytes) { int Read(const char *pch, unsigned int nBytes) {
return in_data ? readData(pch, nBytes) : readHeader(pch, nBytes); int ret = in_data ? readData(pch, nBytes) : readHeader(pch, nBytes);
if (ret < 0) Reset();
return ret;
} }
CNetMessage GetMessage(const CMessageHeader::MessageStartChars& message_start, int64_t time); CNetMessage GetMessage(const CMessageHeader::MessageStartChars& message_start, int64_t time);
}; };