diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-30 17:10:46 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-30 17:10:58 +0200 |
| commit | 9bc6a6bd7b0ddb12cbafdd6d3b70fb6b10c0d2ba (patch) | |
| tree | 9b55587e612c57457d2875ddde1ab10b2e470c44 /src/net.cpp | |
| parent | ef0801bd138101898f56c2348355cf7feee1fb0e (diff) | |
| parent | 305087bdf640a5c0b3eeeb90d33ee255d2456eba (diff) | |
| download | bitcoin-9bc6a6bd7b0ddb12cbafdd6d3b70fb6b10c0d2ba.tar.xz | |
Merge #8822: net: Consistent checksum handling
305087b net: Hardcode protocol sizes and use fixed-size types (Wladimir J. van der Laan)
41e58fa net: Consistent checksum handling (Wladimir J. van der Laan)
Diffstat (limited to 'src/net.cpp')
| -rw-r--r-- | src/net.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/net.cpp b/src/net.cpp index cce06f2d64..770e2d2959 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -2661,10 +2661,8 @@ void CNode::EndMessage(const char* pszCommand) UNLOCK_FUNCTION(cs_vSend) // Set the checksum uint256 hash = Hash(ssSend.begin() + CMessageHeader::HEADER_SIZE, ssSend.end()); - unsigned int nChecksum = 0; - memcpy(&nChecksum, &hash, sizeof(nChecksum)); - assert(ssSend.size () >= CMessageHeader::CHECKSUM_OFFSET + sizeof(nChecksum)); - memcpy((char*)&ssSend[CMessageHeader::CHECKSUM_OFFSET], &nChecksum, sizeof(nChecksum)); + assert(ssSend.size () >= CMessageHeader::CHECKSUM_OFFSET + CMessageHeader::CHECKSUM_SIZE); + memcpy((char*)&ssSend[CMessageHeader::CHECKSUM_OFFSET], hash.begin(), CMessageHeader::CHECKSUM_SIZE); LogPrint("net", "(%d bytes) peer=%d\n", nSize, id); |