Skip to content

beta7: -addnode phase-2 — respect -connect + prioritize user -addnode over injected bootstrap peers #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
RhettCreighton wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

beta7: -addnode phase-2 — respect -connect + prioritize user -addnode over injected bootstrap peers #128

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2563,8 +2563,13 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
// the CConnman added-node list without lock-ordering hazards, which does
// not exist yet.
if (!mapArgs.count("-connect")) {
// Append the bootstrap peers AFTER any user-supplied -addnode entries
// (which are already present in this vector from ParseParameters), so
// ThreadOpenAddedConnections attempts the user's peers first and the
// injected bootstrap peers only as a fallback. De-duplicate: skip any
// bootstrap peer the user already pinned. Never starves user entries.
std::vector<std::string>& addnodes = mapMultiArgs["-addnode"];
BOOST_FOREACH(const std::string& peer, GetBootstrapPeerList()) {
std::vector<std::string>& addnodes = mapMultiArgs["-addnode"];
if (std::find(addnodes.begin(), addnodes.end(), peer) == addnodes.end()) {
addnodes.push_back(peer);
LogPrintf("Adding bootstrap peer %s as a persistent sync node\n", peer);
Expand Down
Loading