diff options
author | Gregory Maxwell <greg@xiph.org> | 2016-11-22 02:50:24 +0000 |
---|---|---|
committer | Gregory Maxwell <greg@xiph.org> | 2016-11-22 02:54:32 +0000 |
commit | ca8549d2bd32f17f8b69d1edbe3f2976fba504b4 (patch) | |
tree | 91b35fd941534add9632bb65b5f96a57eca037c5 | |
parent | 0c577f2638b7f701e4b4b96c4c8df39dc097cf2f (diff) | |
download | bitcoin-ca8549d2bd32f17f8b69d1edbe3f2976fba504b4.tar.xz |
Always drop the least preferred HB peer when adding a new one.
When a BIP152 HB-mode peer is in the least preferred position and
disconnects, they will not be by ForNode on the next loop. They
will continue to sit in that position and prevent deactivating
HB mode for peers that are still connected.
There is no reason for them to stay in the list if already gone,
so drop the first element unconditionally if there are too many.
Fixes issue #9163.
-rw-r--r-- | src/main.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index 4293a6bebf..dd57153eae 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -529,12 +529,11 @@ void MaybeSetPeerAsAnnouncingHeaderAndIDs(const CNodeState* nodestate, CNode* pf if (lNodesAnnouncingHeaderAndIDs.size() >= 3) { // As per BIP152, we only get 3 of our peers to announce // blocks using compact encodings. - bool found = connman.ForNode(lNodesAnnouncingHeaderAndIDs.front(), [&connman, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion](CNode* pnodeStop){ + connman.ForNode(lNodesAnnouncingHeaderAndIDs.front(), [&connman, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion](CNode* pnodeStop){ connman.PushMessage(pnodeStop, NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion); return true; }); - if(found) - lNodesAnnouncingHeaderAndIDs.pop_front(); + lNodesAnnouncingHeaderAndIDs.pop_front(); } fAnnounceUsingCMPCTBLOCK = true; connman.PushMessage(pfrom, NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion); |