X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=bitcoin.cpp;fp=bitcoin.cpp;h=8d2f7dd114e645191ebc403a3816d0df811e232f;hb=8e0c7b0aa076954469cb1c35785aff8005c8c60f;hp=3ade33dfb4d5f7a1846297d761dcd30e5c052390;hpb=7d700b34ba4213906a7429292a7f3aae1f30d677;p=novacoin-seeder.git diff --git a/bitcoin.cpp b/bitcoin.cpp index 3ade33d..8d2f7dd 100644 --- a/bitcoin.cpp +++ b/bitcoin.cpp @@ -52,13 +52,11 @@ class CNode { if (nHeaderStart == -1) return; unsigned int nSize = vSend.size() - nMessageStart; memcpy((char*)&vSend[nHeaderStart] + offsetof(CMessageHeader, nMessageSize), &nSize, sizeof(nSize)); - if (vSend.GetVersion() >= 209) { - uint256 hash = Hash(vSend.begin() + nMessageStart, vSend.end()); - unsigned int nChecksum = 0; - memcpy(&nChecksum, &hash, sizeof(nChecksum)); - assert(nMessageStart - nHeaderStart >= offsetof(CMessageHeader, nChecksum) + sizeof(nChecksum)); - memcpy((char*)&vSend[nHeaderStart] + offsetof(CMessageHeader, nChecksum), &nChecksum, sizeof(nChecksum)); - } + uint256 hash = Hash(vSend.begin() + nMessageStart, vSend.end()); + unsigned int nChecksum = 0; + memcpy(&nChecksum, &hash, sizeof(nChecksum)); + assert(nMessageStart - nHeaderStart >= offsetof(CMessageHeader, nChecksum) + sizeof(nChecksum)); + memcpy((char*)&vSend[nHeaderStart] + offsetof(CMessageHeader, nChecksum), &nChecksum, sizeof(nChecksum)); nHeaderStart = -1; nMessageStart = -1; } @@ -182,12 +180,10 @@ class CNode { vRecv.insert(vRecv.begin(), vHeaderSave.begin(), vHeaderSave.end()); break; } - if (vRecv.GetVersion() >= 209) { - uint256 hash = Hash(vRecv.begin(), vRecv.begin() + nMessageSize); - unsigned int nChecksum = 0; - memcpy(&nChecksum, &hash, sizeof(nChecksum)); - if (nChecksum != hdr.nChecksum) continue; - } + uint256 hash = Hash(vRecv.begin(), vRecv.begin() + nMessageSize); + unsigned int nChecksum = 0; + memcpy(&nChecksum, &hash, sizeof(nChecksum)); + if (nChecksum != hdr.nChecksum) continue; CDataStream vMsg(vRecv.begin(), vRecv.begin() + nMessageSize, vRecv.nType, vRecv.nVersion); vRecv.ignore(nMessageSize); if (ProcessMessage(strCommand, vMsg))