diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-07-20 15:12:20 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-07-20 15:13:49 +0200 |
| commit | c575260f80e94026204f97714ba6bcb26237d818 (patch) | |
| tree | 9a74a9debf79f9b0daf90a338d76905b8e596315 /src | |
| parent | f7f574d453bf52fafec5bec76b278db97081d837 (diff) | |
| parent | fa4bf92be9420919c74cdde9a973f7327d01ac88 (diff) | |
| download | bitcoin-c575260f80e94026204f97714ba6bcb26237d818.tar.xz | |
Merge #11637: p2p: Remove dead service bits code
fa4bf92be9420919c74cdde9a973f7327d01ac88 Remove dead service bits code (MarcoFalke)
Pull request description:
Seems fine to remove for the upcoming 0.17 release
Fixes #10993
Tree-SHA512: 3a4664b787e3da399bcaaba693619bd384826df14f469dbdfbbfffc540d9da3f2b322cda262b43388376785f77907c2540541c239ab0fca82bd7eb69d02b6b7a
Diffstat (limited to 'src')
| -rw-r--r-- | src/net_processing.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp index a0136675f3..5267f96f70 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -1665,17 +1665,6 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr return false; } - if (nServices & ((1 << 7) | (1 << 5))) { - if (GetTime() < 1533096000) { - // Immediately disconnect peers that use service bits 6 or 8 until August 1st, 2018 - // These bits have been used as a flag to indicate that a node is running incompatible - // consensus rules instead of changing the network magic, so we're stuck disconnecting - // based on these service bits, at least for a while. - pfrom->fDisconnect = true; - return false; - } - } - if (nVersion < MIN_PEER_PROTO_VERSION) { // disconnect from peers older than this proto version |