add 1s-timeout for node-2-node connection

network/tcp.go

@@ -17,8 +17,9 @@ import (
 // received. sends and connects will timeout using this timeout as well.
 var timeout = 1 * time.Minute
 
-// dialTimeout is the timeout for connecting to an end point.
-var dialTimeout = 1 * time.Minute
+// dialTimeout is the timeout for connecting to an end point. This is much
+// lower than the normal read timeout.
+var dialTimeout = 1 * time.Second
 
 // Global lock for 'timeout' (because also used in 'tcp_test.go')
 // Using a 'RWMutex' to be as efficient as possible, because it will be used

network/tls.go

@@ -482,7 +482,8 @@ func NewTLSConn(us *ServerIdentity, them *ServerIdentity, suite Suite) (conn *TC
 	for i := 1; i <= MaxRetryConnect; i++ {
 		var c net.Conn
 		cfg.ServerName = string(nonce)
-		c, err = tls.DialWithDialer(&net.Dialer{Timeout: timeout}, "tcp", netAddr, cfg)
+		c, err = tls.DialWithDialer(&net.Dialer{Timeout: dialTimeout}, "tcp", netAddr,
+			cfg)
 		if err == nil {
 			conn = &TCPConn{
 				conn:  c,

websocket_client.go

@@ -31,11 +31,11 @@ type Client struct {
 	// if not nil, use TLS
 	TLSClientConfig *tls.Config
 	// whether to keep the connection
-	keep             bool
-	rx               uint64
-	tx               uint64
+	keep bool
+	rx   uint64
+	tx   uint64
 	// How long to wait for a reply
-	ReadTimeout      time.Duration
+	ReadTimeout time.Duration
 	// How long to wait to open a connection
 	HandshakeTimeout time.Duration
 	sync.Mutex
@@ -45,11 +45,11 @@ type Client struct {
 // connection will be started, until Close is called.
 func NewClient(suite network.Suite, s string) *Client {
 	return &Client{
-		service:         s,
-		connections:     make(map[destination]*websocket.Conn),
-		connectionsLock: make(map[destination]*sync.Mutex),
-		suite:           suite,
-		ReadTimeout:     time.Second * 60,
+		service:          s,
+		connections:      make(map[destination]*websocket.Conn),
+		connectionsLock:  make(map[destination]*sync.Mutex),
+		suite:            suite,
+		ReadTimeout:      time.Second * 60,
 		HandshakeTimeout: time.Second * 5,
 	}
 }