Add proxy support (fixes #271)

This commit is contained in:
Audrius Butkevicius
2015-10-12 19:30:14 +01:00
parent 2b56961b54
commit 985ea29940
6 changed files with 102 additions and 7 deletions

View File

@@ -12,6 +12,7 @@ import (
"net/url"
"strings"
"github.com/syncthing/syncthing/lib/dialer"
"github.com/syncthing/syncthing/lib/model"
"github.com/syncthing/syncthing/lib/osutil"
)
@@ -37,13 +38,13 @@ func tcpDialer(uri *url.URL, tlsCfg *tls.Config) (*tls.Conn, error) {
return nil, err
}
conn, err := net.DialTCP("tcp", nil, raddr)
conn, err := dialer.Dial(raddr.Network(), raddr.String())
if err != nil {
l.Debugln(err)
return nil, err
}
err = osutil.SetTCPOptions(conn)
err = osutil.SetTCPOptions(conn.(*net.TCPConn))
if err != nil {
l.Infoln(err)
}