Merge pull request #44 from ipfs/fix/dial-read-deadline

add a read deadline for the multistream select on dial
libp2p · Apr 27, 2016 · 0436764 · 0436764
2 parents 17632a3 + d8a6d25
commit 0436764
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/p2p/net/conn/dial.go b/p2p/net/conn/dial.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"math/rand"
 	"strings"
+	"time"
 
 	ci "github.com/ipfs/go-libp2p-crypto"
 	lgbl "github.com/ipfs/go-libp2p-loggables"
@@ -68,12 +69,16 @@ func (d *Dialer) Dial(ctx context.Context, raddr ma.Multiaddr, remote peer.ID) (
 			cryptoProtoChoice = NoEncryptionTag
 		}
 
+		maconn.SetReadDeadline(time.Now().Add(NegotiateReadTimeout))
+
 		err = msmux.SelectProtoOrFail(cryptoProtoChoice, maconn)
 		if err != nil {
 			errOut = err
 			return
 		}
 
+		maconn.SetReadDeadline(time.Time{})
+
 		c, err := newSingleConn(ctx, d.LocalPeer, remote, maconn)
 		if err != nil {
 			maconn.Close()