From 3bcbfcdd700d333fb655ea9e91ad6a0f6b8f2159 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 10 May 2021 17:35:07 +0200
Subject: [SERVER] Honor uplinkTimeout directly when connecting to alt-server

---
 src/server/altservers.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/server/altservers.c')

diff --git a/src/server/altservers.c b/src/server/altservers.c
index 2b65def..4413ca6 100644
--- a/src/server/altservers.c
+++ b/src/server/altservers.c
@@ -551,7 +551,7 @@ static void altservers_findUplinkInternal(dnbd3_uplink_t *uplink)
 		int server = servers[itAlt];
 		// Connect
 		clock_gettime( BEST_CLOCK_SOURCE, &start );
-		int sock = sock_connect( &altServers[server].host, 750, 1000 );
+		int sock = sock_connect( &altServers[server].host, 750, _uplinkTimeout );
 		if ( sock == -1 ) { // Connection failed means global error
 			altservers_serverFailed( server );
 			continue;
@@ -654,7 +654,6 @@ failed:
 		} else {
 			LOG( LOG_DEBUG1, "Change - best: %luµs, current: %luµs", bestRtt, currentRtt );
 		}
-		sock_setTimeout( best.fd, _uplinkTimeout );
 		mutex_lock( &uplink->rttLock );
 		uplink->better = best;
 		uplink->rttTestResult = RTT_DOCHANGE;
-- 
cgit v1.2.3-55-g7522