Use dialer in relay checks (fixes #2732)

2016-01-30 01:52:32 +00:00
parent 016f799983
commit f59e1ad854
5 changed files with 24 additions and 30 deletions
--- a/lib/connections/connections_tcp.go
+++ b/lib/connections/connections_tcp.go
@@ -14,7 +14,6 @@ import (

 	"github.com/syncthing/syncthing/lib/dialer"
 	"github.com/syncthing/syncthing/lib/model"
-	"github.com/syncthing/syncthing/lib/osutil"
 )

 func init() {
@@ -72,7 +71,7 @@ func tcpListener(uri *url.URL, tlsCfg *tls.Config, conns chan<- model.Intermedia

 		l.Debugln("connect from", conn.RemoteAddr())

-		err = osutil.SetTCPOptions(conn.(*net.TCPConn))
+		err = dialer.SetTCPOptions(conn.(*net.TCPConn))
 		if err != nil {
 			l.Infoln(err)
 		}