perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/connections: Handle wrapped connection in SetTCPOptions (fixes #3223)

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3225
This commit is contained in:
Jakob Borg
2016-05-31 08:11:57 +00:00
committed by Audrius Butkevicius
parent 9d756525ce
commit ac40b27c79
7 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/dialer/internal.go
View File

@@ -57,9 +57,7 @@ func dialWithFallback(proxyDialFunc dialFunc, fallbackDialFunc dialFunc, network
conn, err := proxyDialFunc(network, addr)
if err == nil {
l.Debugf("Dialing %s address %s via proxy - success, %s -> %s", network, addr, conn.LocalAddr(), conn.RemoteAddr())
if tcpconn, ok := conn.(*net.TCPConn); ok {
SetTCPOptions(tcpconn)
}
SetTCPOptions(conn)
return dialerConn{
conn, newDialerAddr(network, addr),
}, nil
@@ -73,9 +71,7 @@ func dialWithFallback(proxyDialFunc dialFunc, fallbackDialFunc dialFunc, network
conn, err = fallbackDialFunc(network, addr)
if err == nil {
l.Debugf("Dialing %s address %s via fallback - success, %s -> %s", network, addr, conn.LocalAddr(), conn.RemoteAddr())
if tcpconn, ok := conn.(*net.TCPConn); ok {
SetTCPOptions(tcpconn)
}
SetTCPOptions(conn)
} else {
l.Debugf("Dialing %s address %s via fallback - error %s", network, addr, err)
}