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/image.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/image.c')
-rw-r--r-- | src/server/image.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/server/image.c b/src/server/image.c index 644e2a1..7e5ea4a 100644 --- a/src/server/image.c +++ b/src/server/image.c @@ -1258,7 +1258,7 @@ static dnbd3_image_t *loadImageProxy(char * const name, const uint16_t revision, bool ok = false; int sock; if ( i >= count ) { - sock = sock_multiConnect( cons, NULL, 100, 1000 ); + sock = sock_multiConnect( cons, NULL, 100, _uplinkTimeout ); if ( sock == -2 ) break; } else { if ( log_hasMask( LOG_DEBUG2 ) ) { @@ -1267,7 +1267,7 @@ static dnbd3_image_t *loadImageProxy(char * const name, const uint16_t revision, host[len] = '\0'; logadd( LOG_DEBUG2, "Trying to replicate from %s", host ); } - sock = sock_multiConnect( cons, &servers[i], 100, 1000 ); + sock = sock_multiConnect( cons, &servers[i], 100, _uplinkTimeout ); } if ( sock == -1 || sock == -2 ) continue; salen = sizeof(sa); @@ -1325,7 +1325,6 @@ server_fail: ; image = image_get( name, acceptedRemoteRid, false ); if ( image != NULL && uplinkSock != -1 ) { // If so, init the uplink and pass it the socket - sock_setTimeout( uplinkSock, _uplinkTimeout ); if ( !uplink_init( image, uplinkSock, &uplinkServer, remoteProtocolVersion ) ) { close( uplinkSock ); } else { |