config: make LoopbackAddressesOnLanDHT a Flag

ipfs · Apr 4, 2024 · 90b0f7a · 90b0f7a
1 parent 34fbe89
commit 90b0f7a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/config/profile.go b/config/profile.go
@@ -82,7 +82,7 @@ is useful when using the daemon in test environments.`,
 			}
 
 			c.Swarm.DisableNatPortMap = true
-			c.Routing.LoopbackAddressesOnLanDHT = true
+			c.Routing.LoopbackAddressesOnLanDHT = True
 
 			c.Bootstrap = []string{}
 			c.Discovery.MDNS.Enabled = false

diff --git a/config/routing.go b/config/routing.go
@@ -21,7 +21,7 @@ type Routing struct {
 
 	AcceleratedDHTClient Flag `json:",omitempty"`
 
-	LoopbackAddressesOnLanDHT bool
+	LoopbackAddressesOnLanDHT Flag `json:",omitempty"`
 
 	Routers Routers
 

diff --git a/core/node/libp2p/host.go b/core/node/libp2p/host.go
@@ -60,7 +60,7 @@ func Host(mctx helpers.MetricsCtx, lc fx.Lifecycle, params P2PHostIn) (out P2PHo
 		BootstrapPeers:                bootstrappers,
 		OptimisticProvide:             cfg.Experimental.OptimisticProvide,
 		OptimisticProvideJobsPoolSize: cfg.Experimental.OptimisticProvideJobsPoolSize,
-		LoopbackAddressesOnLanDHT:     cfg.Routing.LoopbackAddressesOnLanDHT,
+		LoopbackAddressesOnLanDHT:     cfg.Routing.LoopbackAddressesOnLanDHT.WithDefault(false),
 	}
 	opts = append(opts, libp2p.Routing(func(h host.Host) (routing.PeerRouting, error) {
 		args := routingOptArgs

diff --git a/docs/changelogs/v0.28.md b/docs/changelogs/v0.28.md
@@ -33,6 +33,8 @@ The Object API commands deprecated back in [2021](https://github.com/ipfs/kubo/i
 
 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.
 
+To support testing scenarios where multiple Kubo instances run on the same machine, [`Routing.LoopbackAddressesOnLanDHT`](https://github.com/ipfs/kubo/blob/master/docs/config.md#routingloopbackaddressesonlandht) is set to `true` when the `test` profile is applied.
+
 ### 📝 Changelog
 
 ### 👨‍👩‍👧‍👦 Contributors
diff --git a/test/cli/harness/node.go b/test/cli/harness/node.go
@@ -208,7 +208,7 @@ func (n *Node) Init(ipfsArgs ...string) *Node {
 		cfg.Addresses.Gateway = []string{n.GatewayListenAddr.String()}
 		cfg.Swarm.DisableNatPortMap = true
 		cfg.Discovery.MDNS.Enabled = n.EnableMDNS
-		cfg.Routing.LoopbackAddressesOnLanDHT = true
+		cfg.Routing.LoopbackAddressesOnLanDHT = config.True
 	})
 	return n
 }