Remove relay address filtering logic
License: MIT Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
Łukasz Magiera committed
Apr 15, 2019 at 17:16 UTC
19cc7c9297d73fffc92f8ce2488e3ae4169c90cb
1 file changed
-22
core/node/libp2p.go
-22
@@ -17,7 +17,6 @@ import (
17
"github.com/libp2p/go-libp2p"
18
"github.com/libp2p/go-libp2p-autonat-svc"
19
"github.com/libp2p/go-libp2p-circuit"
20
- circuit "github.com/libp2p/go-libp2p-circuit"
20
"github.com/libp2p/go-libp2p-connmgr"
21
"github.com/libp2p/go-libp2p-crypto"
22
"github.com/libp2p/go-libp2p-host"
@@ -229,31 +228,10 @@ func P2PAddrsFactory(cfg *config.Config) (opts Libp2pOpts, err error) {
228
if err != nil {
229
return opts, err
230
}
232
- if !cfg.Swarm.DisableRelay {
233
- addrsFactory = composeAddrsFactory(addrsFactory, filterRelayAddrs)
234
- }
231
opts.Opts = append(opts.Opts, libp2p.AddrsFactory(addrsFactory))
232
return
233
}
234
239
-func filterRelayAddrs(addrs []ma.Multiaddr) []ma.Multiaddr {
240
- var raddrs []ma.Multiaddr
241
- for _, addr := range addrs {
242
- _, err := addr.ValueForProtocol(circuit.P_CIRCUIT)
243
- if err == nil {
244
- continue
245
- }
246
- raddrs = append(raddrs, addr)
247
- }
248
- return raddrs
249
-}
250
-
251
-func composeAddrsFactory(f, g p2pbhost.AddrsFactory) p2pbhost.AddrsFactory {
252
- return func(addrs []ma.Multiaddr) []ma.Multiaddr {
253
- return f(g(addrs))
254
- }
255
-}
256
-
235
func P2PConnectionManager(cfg *config.Config) (opts Libp2pOpts, err error) {
236
grace := config.DefaultConnMgrGracePeriod
237
low := config.DefaultConnMgrHighWater