net: only enforce expected services for half of outgoing connections #10441
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
utACK 0f1e7d3 |
jonasschnelli
approved these changes
May 24, 2017
theuni
force-pushed
the
serviceflags-required
branch
from
0f1e7d3
to
7e1718d
Compare
|
Updated to fix an issue pointed out by @gmaxwell |
|
utACK 7e1718d |
1 similar comment
|
utACK 7e1718d |
|
(re)utACK 7e1718d389d6cb1223124cefa594f136f56ec4d1 |
|
Perhaps consider bracing the conditionals? (at least the new ones?) |
theuni
force-pushed
the
serviceflags-required
branch
from
7e1718d
to
4cc2e4d
Compare
|
@gmaxwell done. diff from before is cosmetic only: diff --git a/src/net.cpp b/src/net.cpp
index 1e50cfb..22d26a9 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1796,11 +1796,13 @@ void CConnman::ThreadOpenConnections()
// only consider nodes missing relevant services after 40 failed attempts and only if less than half the outbound are up.
ServiceFlags nRequiredServices = nRelevantServices;
- if (nTries >= 40 && nOutbound < (nMaxOutbound >> 1))
+ if (nTries >= 40 && nOutbound < (nMaxOutbound >> 1)) {
nRequiredServices = REQUIRED_SERVICES;
+ }
- if ((addr.nServices & nRequiredServices) != nRequiredServices)
+ if ((addr.nServices & nRequiredServices) != nRequiredServices) {
continue;
+ }
// do not allow non-default ports, unless after 50 invalid addresses selected already
if (addr.GetPort() != Params().GetDefaultPort() && nTries < 50) |
sipa
reviewed
May 26, 2017
| // regardless of the services assumed to be available, only require the minimum if half or more outbound have relevant services | ||
| if (nOutboundRelevant >= (nMaxOutbound >> 1)) { | ||
| addrConnect.nServices = REQUIRED_SERVICES; | ||
| } else { |
There was a problem hiding this comment.
I think this else branch is unnecessary?
There was a problem hiding this comment.
It possibly downgrades the requirement from line 1799.
|
theuni
force-pushed
the
serviceflags-required
branch
from
4cc2e4d
to
b6fbfc2
Compare
|
Yikes, thanks. Pushed the fixup. |
also once half of all outgoing nodes have our preferred flags, require only minimal flags from the rest.
laanwj
added a commit
that referenced
this pull request
Jun 1, 2017
…g connections b6fbfc2 net: only enforce the services required to connect (Cory Fields) Tree-SHA512: 88943bff63213a734f3c96c45760cadaeb9ba18287c8a20c279851ebaf058a334c969028fb2180f155508e3eea4b838147382e4f2b655e7a9aa098eadc81d53e
|
utACK b6fbfc2 |
nomnombtc
pushed a commit
to nomnombtc/bitcoin
that referenced
this pull request
Jul 17, 2017
also once half of all outgoing nodes have our preferred flags, require only minimal flags from the rest. Github-Pull: bitcoin#10441 Rebased-From: b6fbfc2
codablock
pushed a commit
to codablock/dash
that referenced
this pull request
Jan 26, 2018
…outgoing connections b6fbfc2 net: only enforce the services required to connect (Cory Fields) Tree-SHA512: 88943bff63213a734f3c96c45760cadaeb9ba18287c8a20c279851ebaf058a334c969028fb2180f155508e3eea4b838147382e4f2b655e7a9aa098eadc81d53e
andvgal
pushed a commit
to energicryptocurrency/gen2-energi
that referenced
this pull request
Jan 6, 2019
…outgoing connections b6fbfc2 net: only enforce the services required to connect (Cory Fields) Tree-SHA512: 88943bff63213a734f3c96c45760cadaeb9ba18287c8a20c279851ebaf058a334c969028fb2180f155508e3eea4b838147382e4f2b655e7a9aa098eadc81d53e
andvgal
pushed a commit
to energicryptocurrency/gen2-energi
that referenced
this pull request
Jan 6, 2019
…outgoing connections b6fbfc2 net: only enforce the services required to connect (Cory Fields) Tree-SHA512: 88943bff63213a734f3c96c45760cadaeb9ba18287c8a20c279851ebaf058a334c969028fb2180f155508e3eea4b838147382e4f2b655e7a9aa098eadc81d53e
CryptoCentric
pushed a commit
to absolute-community/absolute
that referenced
this pull request
Feb 27, 2019
…outgoing connections b6fbfc2 net: only enforce the services required to connect (Cory Fields) Tree-SHA512: 88943bff63213a734f3c96c45760cadaeb9ba18287c8a20c279851ebaf058a334c969028fb2180f155508e3eea4b838147382e4f2b655e7a9aa098eadc81d53e
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This ensures that future flags can be turned off after being enabled without causing all outbound nodes to refuse to connect to it in the future for lack of expected services.
Should probably be backported to 0.14 as well.