status-im
/
go-libp2p-daemon
mirror of https://github.com/status-im/go-libp2p-daemon.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

update daemon creation to work with dht content routing

This commit is contained in:
Mantas Vidutis 2019-01-04 11:50:15 -08:00
parent 1f2565b2f2
commit 85cb72135d
2 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
daemon.go
View File

@ -14,9 +14,9 @@ import (
peer "github.com/libp2p/go-libp2p-peer"
proto "github.com/libp2p/go-libp2p-protocol"
ps "github.com/libp2p/go-libp2p-pubsub"
routing "github.com/libp2p/go-libp2p-routing"
bhost "github.com/libp2p/go-libp2p/p2p/host/basic"
relay "github.com/libp2p/go-libp2p/p2p/host/relay"
rhost "github.com/libp2p/go-libp2p/p2p/host/routed"
ma "github.com/multiformats/go-multiaddr"
manet "github.com/multiformats/go-multiaddr-net"
)
@ -37,11 +37,27 @@ type Daemon struct {
handlers map[proto.ID]ma.Multiaddr
}
func NewDaemon(ctx context.Context, maddr ma.Multiaddr, opts ...libp2p.Option) (*Daemon, error) {
func NewDaemon(ctx context.Context, maddr ma.Multiaddr, dhtEnabled bool, dhtClient bool, opts ...libp2p.Option) (*Daemon, error) {
d := &Daemon{
ctx: ctx,
handlers: make(map[proto.ID]ma.Multiaddr),
}
if dhtEnabled || dhtClient {
var dhtOpts []dhtopts.Option
if dhtClient {
dhtOpts = append(dhtOpts, dhtopts.Client(true))
}
dhtRouting := d.DHTRoutingFactory(dhtOpts)
opts = append(opts, libp2p.Routing(dhtRouting))
}
h, err := libp2p.New(ctx, opts...)
if err != nil {
return nil, err
}
d.host = h
l, err := manet.Listen(maddr)
if err != nil {
@ -53,7 +69,7 @@ func NewDaemon(ctx context.Context, maddr ma.Multiaddr, opts ...libp2p.Option) (
ctx: ctx,
host: h,
listener: l,
handlers: make(map[proto.ID]ma.Multiaddr),
handlers: make(map[proto.ID]string),
}
go d.listen()
@ -61,22 +77,17 @@ func NewDaemon(ctx context.Context, maddr ma.Multiaddr, opts ...libp2p.Option) (
return d, nil
}
func (d *Daemon) EnableDHT(client bool) error {
var opts []dhtopts.Option
if client {
opts = append(opts, dhtopts.Client(true))
}
dht, err := dht.New(d.ctx, d.host, opts...)
func (d *Daemon) DHTRoutingFactory(opts []dhtopts.Option) func(host.Host) (routing.PeerRouting, error) {
makeRouting := func(h host.Host) (routing.PeerRouting, error) {
dhtInst, err := dht.New(d.ctx, h, opts...)
if err != nil {
return err
return nil, err
}
d.dht = dhtInst
return dhtInst, nil
}
d.dht = dht
d.host = rhost.Wrap(d.host, d.dht)
return nil
return makeRouting
}
func (d *Daemon) EnablePubsub(router string, sign, strict bool) error {

20
p2pd/main.go
View File

@ -83,7 +83,6 @@ func main() {
opts = append(opts, libp2p.NATPortMap())
}
if *relayEnabled {
var relayOpts []relay.RelayOpt
if *relayActive {
@ -98,7 +97,17 @@ func main() {
opts = append(opts, libp2p.EnableRelay(relayOpts...))
}
d, err := p2pd.NewDaemon(context.Background(), maddr, opts...)
if *autoRelay {
if ! *dht {
log.Fatal("DHT must be enabled in full node mode in order to enable autorelay")
}
if ! *relayEnabled {
log.Fatal("Relay must be enabled to enable autorelay")
}
opts = append(opts, libp2p.EnableAutoRelay())
}
d, err := p2pd.NewDaemon(context.Background(), maddr, *dht, *dhtClient, opts...)
if err != nil {
log.Fatal(err)
}
@ -118,13 +127,6 @@ func main() {
}
}
if *dht || *dhtClient {
err = d.EnableDHT(*dhtClient)
if err != nil {
log.Fatal(err)
}
}
if *bootstrapPeers != "" {
p2pd.BootstrapPeers = strings.Split(*bootstrapPeers, ",")
}