feat: introduce the dual WAN/LAN DHT
And only join the WAN DHT if we're publicly reachable.
Steven Allen committed
Apr 9, 2020 at 13:17 UTC
8a002250dc0b21f213fea07a8329d8b05ab5ed13
3 files changed
+9
-10
core/node/libp2p/routingopt.go
+3
-4
@@ -8,6 +8,7 @@ import (
8
host "github.com/libp2p/go-libp2p-core/host"
9
routing "github.com/libp2p/go-libp2p-core/routing"
10
dht "github.com/libp2p/go-libp2p-kad-dht"
11
+ dual "github.com/libp2p/go-libp2p-kad-dht/dual"
12
record "github.com/libp2p/go-libp2p-record"
13
)
14
@@ -15,7 +16,7 @@ type RoutingOption func(context.Context, host.Host, datastore.Batching, record.V
16
17
func constructDHTRouting(mode dht.ModeOpt) func(ctx context.Context, host host.Host, dstore datastore.Batching, validator record.Validator) (routing.Routing, error) {
18
return func(ctx context.Context, host host.Host, dstore datastore.Batching, validator record.Validator) (routing.Routing, error) {
18
- return dht.New(
19
+ return dual.New(
20
ctx, host,
21
dht.Concurrency(10),
22
dht.Mode(mode),
@@ -26,9 +27,7 @@ func constructDHTRouting(mode dht.ModeOpt) func(ctx context.Context, host host.H
27
}
28
29
var (
29
- // FIXME: Set this to dht.ModeAuto once we resolve
30
- // https://github.com/libp2p/go-libp2p-kad-dht/issues/564
31
- DHTOption RoutingOption = constructDHTRouting(dht.ModeServer)
30
+ DHTOption RoutingOption = constructDHTRouting(dht.ModeAuto)
31
DHTClientOption = constructDHTRouting(dht.ModeClient)
32
DHTServerOption = constructDHTRouting(dht.ModeServer)
33
NilRouterOption = nilrouting.ConstructNilRouting
go.mod
+2
-2
@@ -66,8 +66,8 @@ require (
66
github.com/libp2p/go-libp2p-core v0.5.1
67
github.com/libp2p/go-libp2p-discovery v0.3.0
68
github.com/libp2p/go-libp2p-http v0.1.5
69
- github.com/libp2p/go-libp2p-kad-dht v0.6.2
70
- github.com/libp2p/go-libp2p-kbucket v0.3.3
69
+ github.com/libp2p/go-libp2p-kad-dht v0.7.2
70
+ github.com/libp2p/go-libp2p-kbucket v0.4.1
71
github.com/libp2p/go-libp2p-loggables v0.1.0
72
github.com/libp2p/go-libp2p-mplex v0.2.3
73
github.com/libp2p/go-libp2p-peerstore v0.2.3
go.sum
+4
-4
@@ -549,10 +549,10 @@ github.com/libp2p/go-libp2p-interface-connmgr v0.0.1/go.mod h1:GarlRLH0LdeWcLnYM
549
github.com/libp2p/go-libp2p-interface-connmgr v0.0.4/go.mod h1:GarlRLH0LdeWcLnYM/SaBykKFl9U5JFnbBGruAk/D5k=
550
github.com/libp2p/go-libp2p-interface-connmgr v0.0.5/go.mod h1:GarlRLH0LdeWcLnYM/SaBykKFl9U5JFnbBGruAk/D5k=
551
github.com/libp2p/go-libp2p-interface-pnet v0.0.1/go.mod h1:el9jHpQAXK5dnTpKA4yfCNBZXvrzdOU75zz+C6ryp3k=
552
-github.com/libp2p/go-libp2p-kad-dht v0.6.2 h1:ZKXN7iqjIGC3+z4MKoBoyOGq6zvJ294J/tAA7LfihV0=
553
-github.com/libp2p/go-libp2p-kad-dht v0.6.2/go.mod h1:LzZi6RR6NrgfFboyk03I5Yzg1Rr4eoQictDXpKpI45c=
554
-github.com/libp2p/go-libp2p-kbucket v0.3.3 h1:V2Zwv6QnCK6Who0iiJW2eUKwdlTYGJ2HnLViaolDOcs=
555
-github.com/libp2p/go-libp2p-kbucket v0.3.3/go.mod h1:IWFdYRBOYzaLEHnvrfzEkr+UcuveCXIoeO8QeFZSI6A=
552
+github.com/libp2p/go-libp2p-kad-dht v0.7.2 h1:pmjjvk0q3wAQVLWWcFaYb0Ha+QXpa7NlzeXkKvhGYXU=
553
+github.com/libp2p/go-libp2p-kad-dht v0.7.2/go.mod h1:+XvZEgO0gOAd9liN1wjdewxIdcdtWLJXG8U8ou2oo/A=
554
+github.com/libp2p/go-libp2p-kbucket v0.4.1 h1:6FyzbQuGLPzbMv3HiD232zqscIz5iB8ppJwb380+OGI=
555
+github.com/libp2p/go-libp2p-kbucket v0.4.1/go.mod h1:7sCeZx2GkNK1S6lQnGUW5JYZCFPnXzAZCCBBS70lytY=
556
github.com/libp2p/go-libp2p-loggables v0.0.1/go.mod h1:lDipDlBNYbpyqyPX/KcoO+eq0sJYEVR2JgOexcivchg=
557
github.com/libp2p/go-libp2p-loggables v0.1.0 h1:h3w8QFfCt2UJl/0/NW4K829HX/0S4KD31PQ7m8UXXO8=
558
github.com/libp2p/go-libp2p-loggables v0.1.0/go.mod h1:EyumB2Y6PrYjr55Q3/tiJ/o3xoDasoRYM7nOzEpoa90=