aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatt Corallo <matt@bluematt.me>2012-07-04 16:40:16 +0200
committerMatt Corallo <matt@bluematt.me>2012-07-04 16:40:16 +0200
commit24154ed64b70ac3c9fdceb6b53f1746b91e53bfa (patch)
tree5b2bb12ea0a41e916a7a1653053d1438b76796ce /src
parentc729dbb6d2b63d9c0b32e3937be0ebf528d4c753 (diff)
Fix remaining warnings.
Diffstat (limited to 'src')
-rw-r--r--src/net.h6
-rw-r--r--src/protocol.h12
2 files changed, 13 insertions, 5 deletions
diff --git a/src/net.h b/src/net.h
index f6608bc030..fccb5d10f9 100644
--- a/src/net.h
+++ b/src/net.h
@@ -371,14 +371,14 @@ public:
// Set the size
unsigned int nSize = vSend.size() - nMessageStart;
- memcpy((char*)&vSend[nHeaderStart] + offsetof(CMessageHeader, nMessageSize), &nSize, sizeof(nSize));
+ memcpy((char*)&vSend[nHeaderStart] + CMessageHeader::MESSAGE_SIZE_OFFSET, &nSize, sizeof(nSize));
// Set the checksum
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));
+ assert(nMessageStart - nHeaderStart >= CMessageHeader::CHECKSUM_OFFSET + sizeof(nChecksum));
+ memcpy((char*)&vSend[nHeaderStart] + CMessageHeader::CHECKSUM_OFFSET, &nChecksum, sizeof(nChecksum));
if (fDebug) {
printf("(%d bytes)\n", nSize);
diff --git a/src/protocol.h b/src/protocol.h
index b516f1b897..36f8b144cd 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -49,8 +49,16 @@ class CMessageHeader
// TODO: make private (improves encapsulation)
public:
- enum { COMMAND_SIZE=12 };
- char pchMessageStart[sizeof(::pchMessageStart)];
+ enum {
+ MESSAGE_START_SIZE=sizeof(::pchMessageStart),
+ COMMAND_SIZE=12,
+ MESSAGE_SIZE_SIZE=sizeof(int),
+ CHECKSUM_SIZE=sizeof(int),
+
+ MESSAGE_SIZE_OFFSET=MESSAGE_START_SIZE+COMMAND_SIZE,
+ CHECKSUM_OFFSET=MESSAGE_SIZE_OFFSET+MESSAGE_SIZE_SIZE
+ };
+ char pchMessageStart[MESSAGE_START_SIZE];
char pchCommand[COMMAND_SIZE];
unsigned int nMessageSize;
unsigned int nChecksum;