diff options
| author | Simon Rettberg | 2021-05-10 17:35:07 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2021-05-10 17:35:07 +0200 |
| commit | 3bcbfcdd700d333fb655ea9e91ad6a0f6b8f2159 (patch) | |
| tree | c9c900fbe987355da0ddbef3d753b3cbdc931fd1 /src/server/altservers.c | |
| parent | [KERNEL] Improve debug output in net.c (diff) | |
| download | dnbd3-3bcbfcdd700d333fb655ea9e91ad6a0f6b8f2159.tar.gz dnbd3-3bcbfcdd700d333fb655ea9e91ad6a0f6b8f2159.tar.xz dnbd3-3bcbfcdd700d333fb655ea9e91ad6a0f6b8f2159.zip | |
[SERVER] Honor uplinkTimeout directly when connecting to alt-server
Diffstat (limited to 'src/server/altservers.c')
| -rw-r--r-- | src/server/altservers.c | 3 |
1 files changed, 1 insertions, 2 deletions
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; |