From 6ba19f5d03744d9b8f2eeb0d4337e3e1abdd8bd6 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Tue, 2 Apr 2024 16:28:16 +0200 Subject: [PATCH] remove PrivateAddressesOnWanDHT --- config/routing.go | 1 - core/node/libp2p/host.go | 1 - core/node/libp2p/routingopt.go | 4 ---- docs/changelogs/v0.28.md | 2 +- docs/config.md | 9 --------- 5 files changed, 1 insertion(+), 16 deletions(-) diff --git a/config/routing.go b/config/routing.go index 1bbcafa9080f..63aeab0af869 100644 --- a/config/routing.go +++ b/config/routing.go @@ -18,7 +18,6 @@ type Routing struct { AcceleratedDHTClient bool LoopbackAddressesOnLanDHT bool - PrivateAddressesOnWanDHT bool Routers Routers diff --git a/core/node/libp2p/host.go b/core/node/libp2p/host.go index 4086fe4e62dc..8a2757432769 100644 --- a/core/node/libp2p/host.go +++ b/core/node/libp2p/host.go @@ -61,7 +61,6 @@ func Host(mctx helpers.MetricsCtx, lc fx.Lifecycle, params P2PHostIn) (out P2PHo OptimisticProvide: cfg.Experimental.OptimisticProvide, OptimisticProvideJobsPoolSize: cfg.Experimental.OptimisticProvideJobsPoolSize, LoopbackAddressesOnLanDHT: cfg.Routing.LoopbackAddressesOnLanDHT, - PrivateAddressesOnWanDHT: cfg.Routing.PrivateAddressesOnWanDHT, } opts = append(opts, libp2p.Routing(func(h host.Host) (routing.PeerRouting, error) { args := routingOptArgs diff --git a/core/node/libp2p/routingopt.go b/core/node/libp2p/routingopt.go index d81c267cfbd5..869b7ef06529 100644 --- a/core/node/libp2p/routingopt.go +++ b/core/node/libp2p/routingopt.go @@ -27,7 +27,6 @@ type RoutingOptionArgs struct { OptimisticProvide bool OptimisticProvideJobsPoolSize int LoopbackAddressesOnLanDHT bool - PrivateAddressesOnWanDHT bool } type RoutingOption func(args RoutingOptionArgs) (routing.Routing, error) @@ -121,9 +120,6 @@ func constructDHTRouting(mode dht.ModeOpt) RoutingOption { wanOptions := []dht.Option{ dht.BootstrapPeers(args.BootstrapPeers...), } - if args.PrivateAddressesOnWanDHT { - wanOptions = append(wanOptions, dht.AddressFilter(nil)) - } lanOptions := []dht.Option{} if args.LoopbackAddressesOnLanDHT { lanOptions = append(lanOptions, dht.AddressFilter(nil)) diff --git a/docs/changelogs/v0.28.md b/docs/changelogs/v0.28.md index 892de6d619f7..89a40416eab2 100644 --- a/docs/changelogs/v0.28.md +++ b/docs/changelogs/v0.28.md @@ -31,7 +31,7 @@ The Object API commands deprecated back in [2021](https://github.com/ipfs/kubo/i ##### Kubo ignores loopback addresses on LAN DHT and private addresses on WAN DHT -Kubo no longer keeps track of loopback and private addresses on the LAN and WAN DHTs, respectively. This means that other nodes will not try to dial likely undialable addresses. If, for some reason, you need this, we have added two new boolean options to the configuration: `Routing.LoopbackAddressesOnLanDHT` and `Routing.PrivateAddressesOnWanDHT`. +Kubo no longer keeps track of loopback and private addresses on the LAN and WAN DHTs, respectively. This means that other nodes will not try to dial likely undialable addresses. ### 📝 Changelog diff --git a/docs/config.md b/docs/config.md index 66d45ab1cb7f..9f5c2424027d 100644 --- a/docs/config.md +++ b/docs/config.md @@ -118,7 +118,6 @@ config file at runtime. - [`Routing.Type`](#routingtype) - [`Routing.AcceleratedDHTClient`](#routingaccelerateddhtclient) - [`Routing.LoopbackAddressesOnLanDHT`](#routingloopbackaddressesonlandht) - - [`Routing.PrivateAddressesOnWanDHT`](#routingprivateaddressesonwandht) - [`Routing.Routers`](#routingrouters) - [`Routing.Routers: Type`](#routingrouters-type) - [`Routing.Routers: Parameters`](#routingrouters-parameters) @@ -1623,14 +1622,6 @@ Default: `false` Type: `bool` (missing means `false`) -### `Routing.PrivateAddressesOnWanDHT` - -Whether private addresses should not be ignored on the WAN DHT. - -Default: `false` - -Type: `bool` (missing means `false`) - ### `Routing.Routers` **EXPERIMENTAL: `Routing.Routers` configuration may change in future release**