cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

unconditionally disable relay

Browse Source
This commit is contained in:
vyzo 2020-05-25 13:39:50 +03:00
parent 92d58ab191
commit 314da26da3
2 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node/builder.go
View File

@ -169,7 +169,7 @@ func libp2p() Option {
Override(DiscoveryHandlerKey, lp2p.DiscoveryHandler), Override(DiscoveryHandlerKey, lp2p.DiscoveryHandler),
Override(AddrsFactoryKey, lp2p.AddrsFactory(nil, nil)), Override(AddrsFactoryKey, lp2p.AddrsFactory(nil, nil)),
Override(SmuxTransportKey, lp2p.SmuxTransport(true)), Override(SmuxTransportKey, lp2p.SmuxTransport(true)),
Override(RelayKey, lp2p.Relay(true, false)), Override(RelayKey, lp2p.NoRelay()),
Override(SecurityKey, lp2p.Security(true, true)), Override(SecurityKey, lp2p.Security(true, true)),
Override(BaseRoutingKey, lp2p.BaseRouting), Override(BaseRoutingKey, lp2p.BaseRouting),

34
node/modules/lp2p/relay.go
View File

@ -4,29 +4,15 @@ import (
"fmt" "fmt"
"github.com/libp2p/go-libp2p" "github.com/libp2p/go-libp2p"
circuit "github.com/libp2p/go-libp2p-circuit"
coredisc "github.com/libp2p/go-libp2p-core/discovery" coredisc "github.com/libp2p/go-libp2p-core/discovery"
routing "github.com/libp2p/go-libp2p-core/routing" routing "github.com/libp2p/go-libp2p-core/routing"
discovery "github.com/libp2p/go-libp2p-discovery" discovery "github.com/libp2p/go-libp2p-discovery"
basichost "github.com/libp2p/go-libp2p/p2p/host/basic"
relay "github.com/libp2p/go-libp2p/p2p/host/relay"
"go.uber.org/fx"
"github.com/filecoin-project/lotus/node/modules/helpers"
) )
func Relay(disable, enableHop bool) func() (opts Libp2pOpts, err error) { func NoRelay() func() (opts Libp2pOpts, err error) {
return func() (opts Libp2pOpts, err error) { return func() (opts Libp2pOpts, err error) {
if disable { // always disabled, it's an eclipse attack vector
// Enabled by default. opts.Opts = append(opts.Opts, libp2p.DisableRelay())
opts.Opts = append(opts.Opts, libp2p.DisableRelay())
} else {
relayOpts := []circuit.RelayOpt{circuit.OptDiscovery}
if enableHop {
relayOpts = append(relayOpts, circuit.OptHop)
}
opts.Opts = append(opts.Opts, libp2p.EnableRelay(relayOpts...))
}
return return
} }
} }
@ -40,17 +26,3 @@ func Discovery(router BaseIpfsRouting) (coredisc.Discovery, error) {
return discovery.NewRoutingDiscovery(crouter), nil return discovery.NewRoutingDiscovery(crouter), nil
} }
// NOTE: only set when relayHop is set
func AdvertiseRelay(mctx helpers.MetricsCtx, d coredisc.Discovery) {
relay.Advertise(mctx, d)
}
// NOTE: only set when relayHop is not set
func AutoRelay(mctx helpers.MetricsCtx, lc fx.Lifecycle, router BaseIpfsRouting, h RawHost, d coredisc.Discovery) error {
ctx := helpers.LifecycleCtx(mctx, lc)
// TODO: review: LibP2P doesn't set this as host in config.go, why?
_ = relay.NewAutoRelay(ctx, h.(*basichost.BasicHost), d, router, nil)
return nil
}