Take timeout into account when dialing

2015-11-26 23:41:11 +00:00
parent a4b8c2298a
commit ed792b97c0
2 changed files with 3 additions and 2 deletions
--- a/lib/relay/client/methods.go
+++ b/lib/relay/client/methods.go
@@ -21,7 +21,7 @@ func GetInvitationFromRelay(uri *url.URL, id syncthingprotocol.DeviceID, certs [
 		return protocol.SessionInvitation{}, fmt.Errorf("Unsupported relay scheme: %v", uri.Scheme)
 	}

-	rconn, err := dialer.Dial("tcp", uri.Host)
+	rconn, err := dialer.DialTimeout("tcp", uri.Host, timeout)
 	if err != nil {
 		return protocol.SessionInvitation{}, err
 	}