From 11b9212948d98f32e081d9b77ba6ac939005e797 Mon Sep 17 00:00:00 2001 From: perewa Date: Wed, 8 Jun 2016 19:46:54 +0000 Subject: [PATCH] cmd/syncthing: Increase timeout in hello message exchange Required to establish connections on high latency links Skip-check: authors GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3286 --- lib/connections/service.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/connections/service.go b/lib/connections/service.go index bfbc2b9c..52b4136a 100644 --- a/lib/connections/service.go +++ b/lib/connections/service.go @@ -554,7 +554,7 @@ func (s *Service) getListenerFactory(cfg config.Configuration, uri *url.URL) (li } func exchangeHello(c net.Conn, h protocol.HelloMessage) (protocol.HelloMessage, error) { - if err := c.SetDeadline(time.Now().Add(2 * time.Second)); err != nil { + if err := c.SetDeadline(time.Now().Add(20 * time.Second)); err != nil { return protocol.HelloMessage{}, err } defer c.SetDeadline(time.Time{})