Unverified Commit c827b8ba authored by Steven Allen's avatar Steven Allen Committed by GitHub

Merge pull request #21 from libp2p/fix/full-close

fully close the autonat client stream
parents af9b2abb 86c0a65d
Pipeline #465 failed with stages
in 0 seconds
......@@ -49,7 +49,9 @@ func (c *client) DialBack(ctx context.Context, p peer.ID) (ma.Multiaddr, error)
if err != nil {
return nil, err
}
defer s.Close()
// Might as well just reset the stream. Once we get to this point, we
// don't care about being nice.
defer inet.FullClose(s)
r := ggio.NewDelimitedReader(s, inet.MessageSizeMax)
w := ggio.NewDelimitedWriter(s)
......@@ -57,12 +59,14 @@ func (c *client) DialBack(ctx context.Context, p peer.ID) (ma.Multiaddr, error)
req := newDialMessage(pstore.PeerInfo{ID: c.h.ID(), Addrs: c.getAddrs()})
err = w.WriteMsg(req)
if err != nil {
s.Reset()
return nil, err
}
var res pb.Message
err = r.ReadMsg(&res)
if err != nil {
s.Reset()
return nil, err
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment