diff options
author | Pieter Wuille <pieter.wuille@gmail.com> | 2016-11-07 14:12:26 -0800 |
---|---|---|
committer | Pieter Wuille <pieter.wuille@gmail.com> | 2016-11-07 14:19:44 -0800 |
commit | 9f554e03ebe5701c1b75ff03b3d6152095c0cad3 (patch) | |
tree | 1b71c507fc134b726c5bf39ec48e31396c936568 | |
parent | 1253f8692fc3a11be9430685cd405236a68df6c3 (diff) | |
parent | fe1dc62cef88280d2490a619beded052f313c6fc (diff) | |
download | bitcoin-9f554e03ebe5701c1b75ff03b3d6152095c0cad3.tar.xz |
Merge #9045: Hash P2P messages as they are received instead of at process-time
fe1dc62 Hash P2P messages as they are received instead of at process-time (Matt Corallo)
-rw-r--r-- | src/main.cpp | 2 | ||||
-rw-r--r-- | src/net.cpp | 9 | ||||
-rw-r--r-- | src/net.h | 5 |
3 files changed, 15 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index e0c614b731..2fb143e6a0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -6399,7 +6399,7 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman) // Checksum CDataStream& vRecv = msg.vRecv; - uint256 hash = Hash(vRecv.begin(), vRecv.begin() + nMessageSize); + const uint256& hash = msg.GetMessageHash(); if (memcmp(hash.begin(), hdr.pchChecksum, CMessageHeader::CHECKSUM_SIZE) != 0) { LogPrintf("%s(%s, %u bytes): CHECKSUM ERROR expected %s was %s\n", __func__, diff --git a/src/net.cpp b/src/net.cpp index 4ab8ef98ab..e47a8bb168 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -742,12 +742,21 @@ int CNetMessage::readData(const char *pch, unsigned int nBytes) vRecv.resize(std::min(hdr.nMessageSize, nDataPos + nCopy + 256 * 1024)); } + hasher.Write((const unsigned char*)pch, nCopy); memcpy(&vRecv[nDataPos], pch, nCopy); nDataPos += nCopy; return nCopy; } +const uint256& CNetMessage::GetMessageHash() const +{ + assert(complete()); + if (data_hash.IsNull()) + hasher.Finalize(data_hash.begin()); + return data_hash; +} + @@ -543,6 +543,9 @@ public: class CNetMessage { +private: + mutable CHash256 hasher; + mutable uint256 data_hash; public: bool in_data; // parsing header (false) or data (true) @@ -570,6 +573,8 @@ public: return (hdr.nMessageSize == nDataPos); } + const uint256& GetMessageHash() const; + void SetVersion(int nVersionIn) { hdrbuf.SetVersion(nVersionIn); |