notify: handle new connections asynchronously

Trying to create a stream from with a connection notifier is *not* allowed (and
will deadlock).

Also, use the pubsub context when trying to open the stream.
This commit is contained in:
Steven Allen 2017-07-27 18:43:54 -07:00
parent 704754bd7a
commit 5ee3bddaad

View File

@ -1,8 +1,6 @@
package floodsub package floodsub
import ( import (
"context"
inet "github.com/libp2p/go-libp2p-net" inet "github.com/libp2p/go-libp2p-net"
ma "github.com/multiformats/go-multiaddr" ma "github.com/multiformats/go-multiaddr"
) )
@ -18,7 +16,8 @@ func (p *PubSubNotif) ClosedStream(n inet.Network, s inet.Stream) {
} }
func (p *PubSubNotif) Connected(n inet.Network, c inet.Conn) { func (p *PubSubNotif) Connected(n inet.Network, c inet.Conn) {
s, err := p.host.NewStream(context.Background(), c.RemotePeer(), ID) go func() {
s, err := p.host.NewStream(p.ctx, c.RemotePeer(), ID)
if err != nil { if err != nil {
log.Warning("opening new stream to peer: ", err, c.LocalPeer(), c.RemotePeer()) log.Warning("opening new stream to peer: ", err, c.LocalPeer(), c.RemotePeer())
return return
@ -29,6 +28,7 @@ func (p *PubSubNotif) Connected(n inet.Network, c inet.Conn) {
case <-p.ctx.Done(): case <-p.ctx.Done():
s.Close() s.Close()
} }
}()
} }
func (p *PubSubNotif) Disconnected(n inet.Network, c inet.Conn) { func (p *PubSubNotif) Disconnected(n inet.Network, c inet.Conn) {