swarm: make black hole detection configurable #2403
Merged
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
p2p/net/swarm/swarm.go
Outdated
| @@ -108,6 +108,28 @@ func WithDialRanker(d network.DialRanker) Option { | |||
| } | |||
| } | |||
|
|
|||
| // WithUDPBlackHoleConfig configures swarm to use c as the config for UDP black hole detection | |||
| func WithUDPBlackHoleConfig(c *BlackHoleConfig) Option { | |||
There was a problem hiding this comment.
Alternatively, you could just make these 3 function parameters:
func WithUDPBlackHoleConfig(enabled bool, n, min int)and then make BlackHoleConfig an unexported struct.
options.go
Outdated
Comment on lines
592
to
612
| // UDPBlackHoleConfig configures libp2p to use c as the config for UDP black hole detection | ||
| func UDPBlackHoleConfig(c *swarm.BlackHoleConfig) Option { | ||
| return func(cfg *Config) error { | ||
| if c == nil { | ||
| return errors.New("udp black hole config cannot be nil") | ||
| } | ||
| cfg.UDPBlackHoleConfig = c | ||
| return nil | ||
| } | ||
| } | ||
|
|
||
| // IPv6BlackHoleConfig configures libp2p to use c as the config for IPv6 black hole detection | ||
| func IPv6BlackHoleConfig(c *swarm.BlackHoleConfig) Option { | ||
| return func(cfg *Config) error { | ||
| if c == nil { | ||
| return errors.New("ipv6 black hole config cannot be nil") | ||
| } | ||
| cfg.IPv6BlackHoleConfig = c | ||
| return nil | ||
| } | ||
| } |
There was a problem hiding this comment.
What about making this more general by having a SwarmOpts(opts ...swarm.Option) Option here?
There was a problem hiding this comment.
Your suggestion is right. I did it this way because none of the other swarm.Options were exposed here. We should also fix the other cases like this one https://github.com/libp2p/go-libp2p/blob/master/config/config.go#L176
sukunrt
force-pushed
the
sukun/black-hole-config
branch
from
53bc6d2
to
74594e9
Compare
marten-seemann
approved these changes
Jul 7, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
fixes #2398