aboutsummaryrefslogtreecommitdiff
path: root/src/protocol.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2012-04-12 20:07:49 -0400
committerJeff Garzik <jgarzik@redhat.com>2012-04-12 20:07:49 -0400
commit8b09cd3a4db2d712e91826d44a0e777478b450c6 (patch)
tree805a27b103f0c4a5da60ac7196bcc13a65930c42 /src/protocol.h
parentb87c0fc4403040185b625d1b21bbff0cb7c828d7 (diff)
downloadbitcoin-8b09cd3a4db2d712e91826d44a0e777478b450c6.tar.xz
Replace several network protocol version numbers with named constants
stored in version.h. Also, a minor CAddress code reformat while we're in there, fixing some incorrect indentation.
Diffstat (limited to 'src/protocol.h')
-rw-r--r--src/protocol.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/protocol.h b/src/protocol.h
index e639127355..a820563d08 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -79,9 +79,10 @@ class CAddress : public CService
if (fRead)
pthis->Init();
if (nType & SER_DISK)
- READWRITE(nVersion);
- if ((nType & SER_DISK) || (nVersion >= 31402 && !(nType & SER_GETHASH)))
- READWRITE(nTime);
+ READWRITE(nVersion);
+ if ((nType & SER_DISK) ||
+ (nVersion >= CADDR_TIME_VERSION && !(nType & SER_GETHASH)))
+ READWRITE(nTime);
READWRITE(nServices);
READWRITE(*pip);
)