deps: libuv: revert 3a9a6e3e6b

This commit reverts "tcp: support customizing TCP_KEEPINTVL
and TCP_KEEPCNT".
Without this revert, we see a lot of flakyness on Windows CI.
PR-URL: #62511
Refs: libuv/libuv@3a9a6e3
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>

Author: aduh95

deps/uv/docs/src/tcp.rst

@@ -91,34 +91,6 @@ API
 
  .. versionchanged:: 1.49.0 If `delay` is less than 1 then ``UV_EINVAL``` is returned.
 
-.. c:function:: int uv_tcp_keepalive_ex(uv_tcp_t* handle, int on, unsigned int idle, unsigned int intvl, unsigned int cnt)
-
- Enable / disable TCP keep-alive with all socket options: `TCP_KEEPIDLE`, `TCP_KEEPINTVL` and `TCP_KEEPCNT`.
- `idle` is the value for `TCP_KEEPIDLE`, `intvl` is the value for `TCP_KEEPINTVL`,
- `cnt` is the value for `TCP_KEEPCNT`, ignored when `on` is zero.
-
- With TCP keep-alive enabled, `idle` is the time (in seconds) the connection needs to remain idle before
- TCP starts sending keep-alive probes. `intvl` is the time (in seconds) between individual keep-alive probes.
- TCP will drop the connection after sending `cnt` probes without getting any replies from the peer, then the
- handle is destroyed with a ``UV_ETIMEDOUT`` error passed to the corresponding callback.
-
- If one of `idle`, `intvl`, or `cnt` is less than 1, ``UV_EINVAL`` is returned.
-
- .. versionchanged:: 1.52.0 added support of setting `TCP_KEEPINTVL` and `TCP_KEEPCNT` socket options.
-
- .. note::
- Ensure that the socket options are supported by the underlying operating system.
- Currently supported platforms:
- - AIX
- - DragonFlyBSD
- - FreeBSD
- - illumos
- - Linux
- - macOS
- - NetBSD
- - Solaris
- - Windows
-
 .. c:function:: int uv_tcp_simultaneous_accepts(uv_tcp_t* handle, int enable)
 
  Enable / disable simultaneous asynchronous accept requests that are

deps/uv/include/uv.h

@@ -602,11 +602,6 @@ UV_EXTERN int uv_tcp_nodelay(uv_tcp_t* handle, int enable);
 UV_EXTERNintuv_tcp_keepalive(uv_tcp_t*handle,
 intenable,
 unsigned intdelay);
-UV_EXTERNintuv_tcp_keepalive_ex(uv_tcp_t*handle,
-inton,
-unsigned intidle,
-unsigned intintvl,
-unsigned intcnt);
 UV_EXTERNintuv_tcp_simultaneous_accepts(uv_tcp_t*handle, intenable);
 
 enumuv_tcp_flags {

deps/uv/src/unix/internal.h

@@ -359,11 +359,7 @@ int uv__slurp(const char* filename, char* buf, size_t len);
 /* tcp */
 intuv__tcp_listen(uv_tcp_t*tcp, intbacklog, uv_connection_cbcb);
 intuv__tcp_nodelay(intfd, inton);
-intuv__tcp_keepalive(intfd,
-inton,
-unsigned intidle,
-unsigned intintvl,
-unsigned intcnt);
+intuv__tcp_keepalive(intfd, inton, unsigned intdelay);
 
 /* tty */
 voiduv__tty_close(uv_tty_t*handle);

deps/uv/src/unix/stream.c

@@ -416,7 +416,7 @@ int uv__stream_open(uv_stream_t* stream, int fd, int flags) {
 
 /* TODO Use delay the user passed in. */
 if ((stream->flags&UV_HANDLE_TCP_KEEPALIVE) &&
-uv__tcp_keepalive(fd, 1, 60, 1, 10)) {
+uv__tcp_keepalive(fd, 1, 60)) {
 returnUV__ERR(errno);
  }
  }

deps/uv/src/unix/tcp.c

@@ -465,18 +465,22 @@ int uv__tcp_nodelay(int fd, int on) {
 #else
 #defineUV_KEEPALIVE_FACTOR(x)
 #endif
-intuv__tcp_keepalive(intfd,
-inton,
-unsigned intidle,
-unsigned intintvl,
-unsigned intcnt) {
+intuv__tcp_keepalive(intfd, inton, unsigned intdelay) {
+intidle;
+intintvl;
+intcnt;
+
+ (void) &idle;
+ (void) &intvl;
+ (void) &cnt;
+
 if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof(on)))
 returnUV__ERR(errno);
 
 if (!on)
 return0;
 
-if (idle<1||intvl<1||cnt<1)
+if (delay<1)
 returnUV_EINVAL;
 
 #ifdef__sun
@@ -502,16 +506,13 @@ int uv__tcp_keepalive(int fd,
  * The TCP connection will be aborted after certain amount of probes, which is set by TCP_KEEPCNT, without receiving response.
  */
 
-/* Kernel expects at least 10 seconds for TCP_KEEPIDLE and TCP_KEEPINTVL. */
+idle=delay;
+/* Kernel expects at least 10 seconds. */
 if (idle<10)
 idle=10;
-if (intvl<10)
-intvl=10;
-/* Kernel expects at most 10 days for TCP_KEEPIDLE and TCP_KEEPINTVL. */
+/* Kernel expects at most 10 days. */
 if (idle>10*24*60*60)
 idle=10*24*60*60;
-if (intvl>10*24*60*60)
-intvl=10*24*60*60;
 
 UV_KEEPALIVE_FACTOR(idle);
 
@@ -521,10 +522,12 @@ int uv__tcp_keepalive(int fd,
 if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &idle, sizeof(idle)))
 returnUV__ERR(errno);
 
+intvl=10; /* required at least 10 seconds */
 UV_KEEPALIVE_FACTOR(intvl);
 if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &intvl, sizeof(intvl)))
 returnUV__ERR(errno);
 
+cnt=1; /* 1 retry, ensure (TCP_KEEPINTVL * TCP_KEEPCNT) is 10 seconds */
 if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &cnt, sizeof(cnt)))
 returnUV__ERR(errno);
 #else
@@ -536,14 +539,15 @@ int uv__tcp_keepalive(int fd,
 
 /* Note that the consequent probes will not be sent at equal intervals on Solaris,
  * but will be sent using the exponential backoff algorithm. */
-unsigned inttime_to_abort=intvl*cnt;
+inttime_to_abort=10; /* 10 seconds */
 UV_KEEPALIVE_FACTOR(time_to_abort);
 if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE_ABORT_THRESHOLD, &time_to_abort, sizeof(time_to_abort)))
 returnUV__ERR(errno);
 #endif
 
 #else/* !defined(__sun) */
 
+idle=delay;
 UV_KEEPALIVE_FACTOR(idle);
 #ifdefTCP_KEEPIDLE
 if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &idle, sizeof(idle)))
@@ -555,12 +559,14 @@ int uv__tcp_keepalive(int fd,
 #endif
 
 #ifdefTCP_KEEPINTVL
+intvl=1; /* 1 second; same as default on Win32 */
 UV_KEEPALIVE_FACTOR(intvl);
 if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &intvl, sizeof(intvl)))
 returnUV__ERR(errno);
 #endif
 
 #ifdefTCP_KEEPCNT
+cnt=10; /* 10 retries; same as hardcoded on Win32 */
 if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &cnt, sizeof(cnt)))
 returnUV__ERR(errno);
 #endif
@@ -588,20 +594,11 @@ int uv_tcp_nodelay(uv_tcp_t* handle, int on) {
 }
 
 
-intuv_tcp_keepalive(uv_tcp_t*handle, inton, unsigned intidle) {
-returnuv_tcp_keepalive_ex(handle, on, idle, 1, 10);
-}
-
-
-intuv_tcp_keepalive_ex(uv_tcp_t*handle,
-inton,
-unsigned intidle,
-unsigned intintvl,
-unsigned intcnt) {
+intuv_tcp_keepalive(uv_tcp_t*handle, inton, unsigned intdelay) {
 interr;
 
 if (uv__stream_fd(handle) !=-1) {
-err=uv__tcp_keepalive(uv__stream_fd(handle), on, idle, intvl, cnt);
+err=uv__tcp_keepalive(uv__stream_fd(handle), on, delay);
 if (err)
 returnerr;
  }
@@ -611,7 +608,7 @@ int uv_tcp_keepalive_ex(uv_tcp_t* handle,
 else
 handle->flags &= ~UV_HANDLE_TCP_KEEPALIVE;
 
-/* TODO Store idle if uv__stream_fd(handle) == -1 but don't want to enlarge
+/* TODO Store delay if uv__stream_fd(handle) == -1 but don't want to enlarge
  * uv_tcp_t with an int that's almost never used...
  */
 

deps/uv/src/win/tcp.c

@@ -49,98 +49,28 @@ static int uv__tcp_nodelay(uv_tcp_t* handle, SOCKET socket, int enable) {
 }
 
 
-/*
- * Check if Windows version is 10.0.16299 (Windows 10, version 1709) or later.
- */
-staticintuv__windows10_version1709(void) {
-OSVERSIONINFOWos_info;
-if (!pRtlGetVersion)
-return0;
-pRtlGetVersion(&os_info);
-if (os_info.dwMajorVersion<10)
-return0;
-if (os_info.dwMajorVersion>10)
-return1;
-if (os_info.dwMinorVersion>0)
-return1;
-returnos_info.dwBuildNumber >= 16299;
-}
-
-
-staticintuv__tcp_keepalive(uv_tcp_t*handle,
-SOCKETsocket,
-inton,
-unsigned intidle,
-unsigned intintvl,
-unsigned intcnt) {
+staticintuv__tcp_keepalive(uv_tcp_t*handle, SOCKETsocket, intenable, unsigned intdelay) {
 if (setsockopt(socket,
 SOL_SOCKET,
 SO_KEEPALIVE,
- (constchar*)&on,
-sizeofon) ==-1) {
+ (constchar*)&enable,
+sizeofenable) ==-1) {
 returnWSAGetLastError();
  }
 
-if (!on)
+if (!enable)
 return0;
 
-if (idle<1||intvl<1||cnt<1)
+if (delay<1)
 returnUV_EINVAL;
 
-/* Windows 10, version 1709 (build 10.0.16299) and later require second units
- * for TCP keepalive options. */
-if (uv__windows10_version1709()) {
-if (setsockopt(socket,
-IPPROTO_TCP,
-TCP_KEEPIDLE,
- (constchar*)&idle,
-sizeofidle) ==-1) {
-returnWSAGetLastError();
- }
-
-if (setsockopt(socket,
-IPPROTO_TCP,
-TCP_KEEPINTVL,
- (constchar*)&intvl,
-sizeofintvl) ==-1) {
-returnWSAGetLastError();
- }
-
-if (setsockopt(socket,
-IPPROTO_TCP,
-TCP_KEEPCNT,
- (constchar*)&cnt,
-sizeofcnt) ==-1) {
-returnWSAGetLastError();
- }
-
-return0;
- }
-
-/* For those versions prior to Windows 10 version 1709,
- * we fall back to SIO_KEEPALIVE_VALS that expects millisecond units.
- * The SIO_KEEPALIVE_VALS IOCTL is supported on Windows 2000
- * and later versions of the operating system. */
-structtcp_keepalivekeepalive;
-keepalive.onoff=on;
-keepalive.keepalivetime=idle*1000;
-keepalive.keepaliveinterval=intvl*1000;
-/* On Windows Vista and later, the number of keep-alive probes
- * (data retransmissions) is set to 10 and cannot be changed.
- * On Windows Server 2003, Windows XP, and Windows 2000, the default setting
- * for number of keep-alive probes is 5 and cannot be changed programmatically.
- */
-DWORDdummy;
-if (WSAIoctl(socket,
-SIO_KEEPALIVE_VALS,
- (LPVOID) &keepalive,
-sizeofkeepalive,
-NULL,
-0,
-&dummy,
-NULL,
-NULL) ==-1)
+if (setsockopt(socket,
+IPPROTO_TCP,
+TCP_KEEPALIVE,
+ (constchar*)&delay,
+sizeofdelay) ==-1) {
 returnWSAGetLastError();
+ }
 
 return0;
 }
@@ -202,7 +132,7 @@ static int uv__tcp_set_socket(uv_loop_t* loop,
 
 /* TODO: Use stored delay. */
 if (handle->flags&UV_HANDLE_TCP_KEEPALIVE) {
-err=uv__tcp_keepalive(handle, socket, 1, 60, 1, 10);
+err=uv__tcp_keepalive(handle, socket, 1, 60);
 if (err)
 returnerr;
  }
@@ -819,6 +749,20 @@ static int uv__is_loopback(const struct sockaddr_storage* storage) {
 return0;
 }
 
+// Check if Windows version is 10.0.16299 or later
+staticintuv__is_fast_loopback_fail_supported(void) {
+OSVERSIONINFOWos_info;
+if (!pRtlGetVersion)
+return0;
+pRtlGetVersion(&os_info);
+if (os_info.dwMajorVersion<10)
+return0;
+if (os_info.dwMajorVersion>10)
+return1;
+if (os_info.dwMinorVersion>0)
+return1;
+returnos_info.dwBuildNumber >= 16299;
+}
 
 staticintuv__tcp_try_connect(uv_connect_t*req,
 uv_tcp_t*handle,
@@ -865,7 +809,7 @@ static int uv__tcp_try_connect(uv_connect_t* req,
  * is not reachable, instead of waiting for 2s. We do not care if this fails.
  * This only works on Windows version 10.0.16299 and later.
  */
-if (uv__windows10_version1709() &&uv__is_loopback(&converted)) {
+if (uv__is_fast_loopback_fail_supported() &&uv__is_loopback(&converted)) {
 memset(&retransmit_ioctl, 0, sizeof(retransmit_ioctl));
 retransmit_ioctl.Rtt=TCP_INITIAL_RTO_NO_SYN_RETRANSMISSIONS;
 retransmit_ioctl.MaxSynRetransmissions=TCP_INITIAL_RTO_NO_SYN_RETRANSMISSIONS;
@@ -1391,30 +1335,22 @@ int uv_tcp_nodelay(uv_tcp_t* handle, int enable) {
 }
 
 
-intuv_tcp_keepalive(uv_tcp_t*handle, inton, unsigned intidle) {
-returnuv_tcp_keepalive_ex(handle, on, idle, 1, 10);
-}
-
-intuv_tcp_keepalive_ex(uv_tcp_t*handle,
-inton,
-unsigned intidle,
-unsigned intintvl,
-unsigned intcnt) {
+intuv_tcp_keepalive(uv_tcp_t*handle, intenable, unsigned intdelay) {
 interr;
 
 if (handle->socket!=INVALID_SOCKET) {
-err=uv__tcp_keepalive(handle, handle->socket, on, idle, intvl, cnt);
+err=uv__tcp_keepalive(handle, handle->socket, enable, delay);
 if (err)
 returnuv_translate_sys_error(err);
  }
 
-if (on) {
+if (enable) {
 handle->flags |= UV_HANDLE_TCP_KEEPALIVE;
  } else {
 handle->flags &= ~UV_HANDLE_TCP_KEEPALIVE;
  }
 
-/* TODO: Store idle if handle->socket isn't created yet. */
+/* TODO: Store delay if handle->socket isn't created yet. */
 
 return0;
 }