diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-11-08 01:03:11 -0800 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-11-08 01:03:11 -0800 |
| commit | 9a165e57140eea0663253c14db0d14b40bde562a (patch) | |
| tree | 26aa5885d5ec103024a7b1ca8413487f01d6fd3a | |
| parent | 7f0ccea7685cb66081bbd889be684eacd76ccd2c (diff) | |
| parent | 1ce418929a17c063a0a2e3b176b82d280ef053a6 (diff) | |
| download | bitcoin-9a165e57140eea0663253c14db0d14b40bde562a.tar.xz | |
Merge pull request #3155 from wtogami/split_proto_var
Split MIN_PROTO_VERSION into INIT_PROTO_VERSION and MIN_PEER_PROTO_VERSION
| -rw-r--r-- | src/main.cpp | 5 | ||||
| -rw-r--r-- | src/net.h | 4 | ||||
| -rw-r--r-- | src/version.h | 7 |
3 files changed, 9 insertions, 7 deletions
diff --git a/src/main.cpp b/src/main.cpp index a952bc2701..145ff7857e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3202,10 +3202,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) CAddress addrFrom; uint64 nNonce = 1; vRecv >> pfrom->nVersion >> pfrom->nServices >> nTime >> addrMe; - if (pfrom->nVersion < MIN_PROTO_VERSION) + if (pfrom->nVersion < MIN_PEER_PROTO_VERSION) { - // Since February 20, 2012, the protocol is initiated at version 209, - // and earlier versions are no longer supported + // disconnect from peers older than this proto version LogPrintf("partner %s using obsolete version %i; disconnecting\n", pfrom->addr.ToString().c_str(), pfrom->nVersion); pfrom->fDisconnect = true; return false; @@ -246,11 +246,11 @@ public: int64 nPingUsecTime; bool fPingQueued; - CNode(SOCKET hSocketIn, CAddress addrIn, std::string addrNameIn = "", bool fInboundIn=false) : ssSend(SER_NETWORK, MIN_PROTO_VERSION) + CNode(SOCKET hSocketIn, CAddress addrIn, std::string addrNameIn = "", bool fInboundIn=false) : ssSend(SER_NETWORK, INIT_PROTO_VERSION) { nServices = 0; hSocket = hSocketIn; - nRecvVersion = MIN_PROTO_VERSION; + nRecvVersion = INIT_PROTO_VERSION; nLastSend = 0; nLastRecv = 0; nSendBytes = 0; diff --git a/src/version.h b/src/version.h index f1e7c4cd7b..f5fa9f213e 100644 --- a/src/version.h +++ b/src/version.h @@ -27,8 +27,11 @@ extern const std::string CLIENT_DATE; static const int PROTOCOL_VERSION = 70001; -// earlier versions not supported as of Feb 2012, and are disconnected -static const int MIN_PROTO_VERSION = 209; +// intial proto version, to be increased after version/verack negotiation +static const int INIT_PROTO_VERSION = 209; + +// disconnect from peers older than this proto version +static const int MIN_PEER_PROTO_VERSION = 209; // nTime field added to CAddress, starting with this version; // if possible, avoid requesting addresses nodes older than this |