|
| 1 | +From 6d2a900487bb9a41f16de4f0092cc9345580e356 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Florian Will < [email protected]> |
| 3 | +Date: Thu, 29 Feb 2024 13:15:02 +0100 |
| 4 | +Subject: [PATCH 1/3] include: Add TCP_KEEPCNT and TCP_KEEPINTVL definitions. |
| 5 | + |
| 6 | +--- |
| 7 | + include/ws2ipdef.h | 4 ++++ |
| 8 | + 1 file changed, 4 insertions(+) |
| 9 | + |
| 10 | +diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h |
| 11 | +index fcb1f56c005..72e2dad2fa5 100644 |
| 12 | +--- a/include/ws2ipdef.h |
| 13 | ++++ b/include/ws2ipdef.h |
| 14 | +@@ -313,6 +313,8 @@ typedef struct WS(in6_pktinfo) { |
| 15 | + #define TCP_OFFLOAD_PREFERENCE 11 |
| 16 | + #define TCP_CONGESTION_ALGORITHM 12 |
| 17 | + #define TCP_DELAY_FIN_ACK 13 |
| 18 | ++#define TCP_KEEPCNT 16 |
| 19 | ++#define TCP_KEEPINTVL 17 |
| 20 | + #else |
| 21 | + /* WS_TCP_NODELAY is defined elsewhere */ |
| 22 | + #define WS_TCP_EXPEDITED_1122 2 |
| 23 | +@@ -327,6 +329,8 @@ typedef struct WS(in6_pktinfo) { |
| 24 | + #define WS_TCP_OFFLOAD_PREFERENCE 11 |
| 25 | + #define WS_TCP_CONGESTION_ALGORITHM 12 |
| 26 | + #define WS_TCP_DELAY_FIN_ACK 13 |
| 27 | ++#define WS_TCP_KEEPCNT 16 |
| 28 | ++#define WS_TCP_KEEPINTVL 17 |
| 29 | + #endif /* USE_WS_PREFIX */ |
| 30 | + |
| 31 | + #define PROTECTION_LEVEL_UNRESTRICTED 10 |
| 32 | +-- |
| 33 | +GitLab |
| 34 | + |
| 35 | + |
| 36 | +From 8dc5242e2998afed87bc57db5798eea85877094e Mon Sep 17 00:00:00 2001 |
| 37 | +From: Florian Will < [email protected]> |
| 38 | +Date: Thu, 29 Feb 2024 13:48:32 +0100 |
| 39 | +Subject: [PATCH 3/3] ws2_32: Implement TCP_KEEP{ALIVE,CNT,INTVL} options. |
| 40 | + |
| 41 | +--- |
| 42 | + dlls/ntdll/unix/socket.c | 28 ++++++++++++++++++ |
| 43 | + dlls/ws2_32/socket.c | 63 ++++++++++++++++++++++++++++++++++++++++ |
| 44 | + dlls/ws2_32/tests/sock.c | 18 ++++++------ |
| 45 | + include/wine/afd.h | 6 ++++ |
| 46 | + 4 files changed, 106 insertions(+), 9 deletions(-) |
| 47 | + |
| 48 | +diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c |
| 49 | +index 4e6781df607..4b0dca37e7d 100644 |
| 50 | +--- a/dlls/ntdll/unix/socket.c |
| 51 | ++++ b/dlls/ntdll/unix/socket.c |
| 52 | +@@ -2507,6 +2507,34 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc |
| 53 | + case IOCTL_AFD_WINE_SET_TCP_NODELAY: |
| 54 | + return do_setsockopt( handle, io, IPPROTO_TCP, TCP_NODELAY, in_buffer, in_size ); |
| 55 | + |
| 56 | ++#if defined(TCP_KEEPIDLE) |
| 57 | ++ /* TCP_KEEPALIVE on Windows is often called TCP_KEEPIDLE on Unix */ |
| 58 | ++ case IOCTL_AFD_WINE_GET_TCP_KEEPALIVE: |
| 59 | ++ return do_getsockopt( handle, io, IPPROTO_TCP, TCP_KEEPIDLE, out_buffer, out_size ); |
| 60 | ++ |
| 61 | ++ case IOCTL_AFD_WINE_SET_TCP_KEEPALIVE: |
| 62 | ++ return do_setsockopt( handle, io, IPPROTO_TCP, TCP_KEEPIDLE, in_buffer, in_size ); |
| 63 | ++#elif defined(TCP_KEEPALIVE) |
| 64 | ++ /* Mac */ |
| 65 | ++ case IOCTL_AFD_WINE_GET_TCP_KEEPALIVE: |
| 66 | ++ return do_getsockopt( handle, io, IPPROTO_TCP, TCP_KEEPALIVE, out_buffer, out_size ); |
| 67 | ++ |
| 68 | ++ case IOCTL_AFD_WINE_SET_TCP_KEEPALIVE: |
| 69 | ++ return do_setsockopt( handle, io, IPPROTO_TCP, TCP_KEEPALIVE, in_buffer, in_size ); |
| 70 | ++#endif |
| 71 | ++ |
| 72 | ++ case IOCTL_AFD_WINE_GET_TCP_KEEPINTVL: |
| 73 | ++ return do_getsockopt( handle, io, IPPROTO_TCP, TCP_KEEPINTVL, out_buffer, out_size ); |
| 74 | ++ |
| 75 | ++ case IOCTL_AFD_WINE_SET_TCP_KEEPINTVL: |
| 76 | ++ return do_setsockopt( handle, io, IPPROTO_TCP, TCP_KEEPINTVL, in_buffer, in_size ); |
| 77 | ++ |
| 78 | ++ case IOCTL_AFD_WINE_GET_TCP_KEEPCNT: |
| 79 | ++ return do_getsockopt( handle, io, IPPROTO_TCP, TCP_KEEPCNT, out_buffer, out_size ); |
| 80 | ++ |
| 81 | ++ case IOCTL_AFD_WINE_SET_TCP_KEEPCNT: |
| 82 | ++ return do_setsockopt( handle, io, IPPROTO_TCP, TCP_KEEPCNT, in_buffer, in_size ); |
| 83 | ++ |
| 84 | + default: |
| 85 | + { |
| 86 | + if ((code >> 16) == FILE_DEVICE_NETWORK) |
| 87 | +diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c |
| 88 | +index 6aab249a1b8..eb84558cbac 100644 |
| 89 | +--- a/dlls/ws2_32/socket.c |
| 90 | ++++ b/dlls/ws2_32/socket.c |
| 91 | +@@ -1931,6 +1931,36 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl |
| 92 | + *optlen = 1; |
| 93 | + return server_getsockopt( s, IOCTL_AFD_WINE_GET_TCP_NODELAY, optval, optlen ); |
| 94 | + |
| 95 | ++ case TCP_KEEPALIVE: |
| 96 | ++ if (*optlen < sizeof(DWORD) || !optval) |
| 97 | ++ { |
| 98 | ++ *optlen = 0; |
| 99 | ++ SetLastError( WSAEFAULT ); |
| 100 | ++ return SOCKET_ERROR; |
| 101 | ++ } |
| 102 | ++ *optlen = sizeof(DWORD); |
| 103 | ++ return server_getsockopt( s, IOCTL_AFD_WINE_GET_TCP_KEEPALIVE, optval, optlen ); |
| 104 | ++ |
| 105 | ++ case TCP_KEEPCNT: |
| 106 | ++ if (*optlen < sizeof(DWORD) || !optval) |
| 107 | ++ { |
| 108 | ++ *optlen = 0; |
| 109 | ++ SetLastError( WSAEFAULT ); |
| 110 | ++ return SOCKET_ERROR; |
| 111 | ++ } |
| 112 | ++ *optlen = sizeof(DWORD); |
| 113 | ++ return server_getsockopt( s, IOCTL_AFD_WINE_GET_TCP_KEEPCNT, optval, optlen ); |
| 114 | ++ |
| 115 | ++ case TCP_KEEPINTVL: |
| 116 | ++ if (*optlen < sizeof(DWORD) || !optval) |
| 117 | ++ { |
| 118 | ++ *optlen = 0; |
| 119 | ++ SetLastError( WSAEFAULT ); |
| 120 | ++ return SOCKET_ERROR; |
| 121 | ++ } |
| 122 | ++ *optlen = sizeof(DWORD); |
| 123 | ++ return server_getsockopt( s, IOCTL_AFD_WINE_GET_TCP_KEEPINTVL, optval, optlen ); |
| 124 | ++ |
| 125 | + default: |
| 126 | + FIXME( "unrecognized TCP option %#x\n", optname ); |
| 127 | + SetLastError( WSAENOPROTOOPT ); |
| 128 | +@@ -3325,6 +3355,12 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int |
| 129 | + break; /* case NSPROTO_IPX */ |
| 130 | + |
| 131 | + case IPPROTO_TCP: |
| 132 | ++ if (optlen < 0) |
| 133 | ++ { |
| 134 | ++ SetLastError(WSAENOBUFS); |
| 135 | ++ return SOCKET_ERROR; |
| 136 | ++ } |
| 137 | ++ |
| 138 | + switch(optname) |
| 139 | + { |
| 140 | + case TCP_NODELAY: |
| 141 | +@@ -3336,6 +3372,33 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int |
| 142 | + value = *optval; |
| 143 | + return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, (char*)&value, sizeof(value) ); |
| 144 | + |
| 145 | ++ case TCP_KEEPALIVE: |
| 146 | ++ if (optlen < sizeof(DWORD) || !optval) |
| 147 | ++ { |
| 148 | ++ SetLastError( WSAEFAULT ); |
| 149 | ++ return SOCKET_ERROR; |
| 150 | ++ } |
| 151 | ++ value = *(DWORD*)optval; |
| 152 | ++ return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_KEEPALIVE, (char*)&value, sizeof(value) ); |
| 153 | ++ |
| 154 | ++ case TCP_KEEPCNT: |
| 155 | ++ if (optlen < sizeof(DWORD) || !optval) |
| 156 | ++ { |
| 157 | ++ SetLastError( WSAEFAULT ); |
| 158 | ++ return SOCKET_ERROR; |
| 159 | ++ } |
| 160 | ++ value = *(DWORD*)optval; |
| 161 | ++ return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_KEEPCNT, (char*)&value, sizeof(value) ); |
| 162 | ++ |
| 163 | ++ case TCP_KEEPINTVL: |
| 164 | ++ if (optlen < sizeof(DWORD) || !optval) |
| 165 | ++ { |
| 166 | ++ SetLastError( WSAEFAULT ); |
| 167 | ++ return SOCKET_ERROR; |
| 168 | ++ } |
| 169 | ++ value = *(DWORD*)optval; |
| 170 | ++ return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_KEEPINTVL, (char*)&value, sizeof(value) ); |
| 171 | ++ |
| 172 | + default: |
| 173 | + FIXME("Unknown IPPROTO_TCP optname 0x%08x\n", optname); |
| 174 | + SetLastError(WSAENOPROTOOPT); |
| 175 | +diff --git a/include/wine/afd.h b/include/wine/afd.h |
| 176 | +index 788adb4a495..aba559ebd8a 100644 |
| 177 | +--- a/include/wine/afd.h |
| 178 | ++++ b/include/wine/afd.h |
| 179 | +@@ -285,6 +285,12 @@ C_ASSERT( sizeof(struct afd_get_events_params) == 56 ); |
| 180 | + #define IOCTL_AFD_WINE_SET_IP_RECVTOS WINE_AFD_IOC(296) |
| 181 | + #define IOCTL_AFD_WINE_GET_SO_EXCLUSIVEADDRUSE WINE_AFD_IOC(297) |
| 182 | + #define IOCTL_AFD_WINE_SET_SO_EXCLUSIVEADDRUSE WINE_AFD_IOC(298) |
| 183 | ++#define IOCTL_AFD_WINE_GET_TCP_KEEPALIVE WINE_AFD_IOC(299) |
| 184 | ++#define IOCTL_AFD_WINE_SET_TCP_KEEPALIVE WINE_AFD_IOC(300) |
| 185 | ++#define IOCTL_AFD_WINE_GET_TCP_KEEPCNT WINE_AFD_IOC(301) |
| 186 | ++#define IOCTL_AFD_WINE_SET_TCP_KEEPCNT WINE_AFD_IOC(302) |
| 187 | ++#define IOCTL_AFD_WINE_GET_TCP_KEEPINTVL WINE_AFD_IOC(303) |
| 188 | ++#define IOCTL_AFD_WINE_SET_TCP_KEEPINTVL WINE_AFD_IOC(304) |
| 189 | + |
| 190 | + struct afd_iovec |
| 191 | + { |
| 192 | +-- |
| 193 | +GitLab |
| 194 | + |
0 commit comments