Skip to content
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

Jump to bottom

implement relay v2 discovery #1368

Merged
merged 9 commits into from Apr 10, 2022
Merged

implement relay v2 discovery #1368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
16de44a
rename autorelay.go to relay_finder.go
marten-seemann Mar 28, 2022
29fd102
implement relay discovery in autorelay
marten-seemann Mar 30, 2022
7e767cb
correctly handle static relays
marten-seemann Mar 30, 2022
98f46f2
rename autorelay.WithNumCandidates to WithMaxCandidates
marten-seemann Apr 5, 2022
6bb54b5
fix logic to prefer circuit v2 over circuit v1
marten-seemann Apr 5, 2022
ca6ded2
fix context leak when autorelay option errors
marten-seemann Apr 5, 2022
220166c
make sure that all static relay servers are used
marten-seemann Apr 5, 2022
44350ef
use exponential backoff, with jitter
marten-seemann Apr 5, 2022
46fc1e5
fix race condition when the AutoRelay peerChan fills up
marten-seemann Apr 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 3 additions & 19 deletions config/config.go
View file
Open in desktop
Expand Up @@ -18,7 +18,6 @@ import (
"github.com/libp2p/go-libp2p-core/transport"
"github.com/libp2p/go-libp2p-peerstore/pstoremem"

drouting "github.com/libp2p/go-libp2p/p2p/discovery/routing"
"github.com/libp2p/go-libp2p/p2p/host/autonat"
"github.com/libp2p/go-libp2p/p2p/host/autorelay"
bhost "github.com/libp2p/go-libp2p/p2p/host/basic"
Expand Down Expand Up @@ -101,8 +100,8 @@ type Config struct {
Routing RoutingC

EnableAutoRelay bool
AutoRelayOpts []autorelay.Option
AutoNATConfig
StaticRelayOpt autorelay.StaticRelayOption

EnableHolePunching bool
HolePunchingOptions []holepunch.Option
Expand Down Expand Up @@ -270,7 +269,7 @@ func (cfg *Config) NewNode() (host.Host, error) {
}
}

// Note: h.AddrsFactory may be changed by AutoRelay, but non-relay version is
// Note: h.AddrsFactory may be changed by relayFinder, but non-relay version is
// used by AutoNAT below.
var ar *autorelay.AutoRelay
addrF := h.AddrsFactory
Expand All @@ -280,22 +279,7 @@ func (cfg *Config) NewNode() (host.Host, error) {
return nil, fmt.Errorf("cannot enable autorelay; relay is not enabled")
}

var opts []autorelay.Option
if cfg.StaticRelayOpt != nil {
opts = append(opts, autorelay.Option(cfg.StaticRelayOpt))
} else {
if router == nil {
h.Close()
return nil, fmt.Errorf("cannot enable autorelay; no routing for discovery")
}
crouter, ok := router.(routing.ContentRouting)
if !ok {
h.Close()
return nil, fmt.Errorf("cannot enable autorelay; no suitable routing for discovery")
}
opts = append(opts, autorelay.WithDiscoverer(drouting.NewRoutingDiscovery(crouter)))
}
ar, err = autorelay.NewAutoRelay(h, router, opts...)
ar, err = autorelay.NewAutoRelay(h, cfg.AutoRelayOpts...)
if err != nil {
return nil, err
}
Expand Down
11 changes: 3 additions & 8 deletions options.go
View file
Open in desktop
Expand Up @@ -250,15 +250,10 @@ func EnableRelayService(opts ...relayv2.Option) Option {
//
// This subsystem performs automatic address rewriting to advertise relay addresses when it
// detects that the node is publicly unreachable (e.g. behind a NAT).
func EnableAutoRelay(opts ...autorelay.StaticRelayOption) Option {
func EnableAutoRelay(opts ...autorelay.Option) Option {
return func(cfg *Config) error {
if len(opts) > 0 {
if len(opts) > 1 {
return errors.New("only expected a single static relay configuration option")
}
cfg.StaticRelayOpt = opts[0]
}
cfg.EnableAutoRelay = true
cfg.AutoRelayOpts = opts
return nil
}
}
Expand All @@ -269,7 +264,7 @@ func EnableAutoRelay(opts ...autorelay.StaticRelayOption) Option {
// Deprecated: pass an autorelay.WithStaticRelays option to EnableAutoRelay.
func StaticRelays(relays []peer.AddrInfo) Option {
return func(cfg *Config) error {
cfg.StaticRelayOpt = autorelay.WithStaticRelays(relays)
cfg.AutoRelayOpts = append(cfg.AutoRelayOpts, autorelay.WithStaticRelays(relays))
return nil
}
}
Expand Down