[PATCH 2/7] ws2_32: Move the getsockopt(SO_REUSEADDR) implementation to ntdll.
Zebediah Figura
z.figura12 at gmail.com
Mon Jun 28 22:39:19 CDT 2021
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/ntdll/unix/socket.c | 3 +++
dlls/ws2_32/socket.c | 4 +++-
include/wine/afd.h | 1 +
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c
index 0ab30ec6515..549981388c7 100644
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -1652,6 +1652,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
case IOCTL_AFD_WINE_SET_SO_OOBINLINE:
return do_setsockopt( handle, io, SOL_SOCKET, SO_OOBINLINE, in_buffer, in_size );
+ case IOCTL_AFD_WINE_GET_SO_REUSEADDR:
+ return do_getsockopt( handle, io, SOL_SOCKET, SO_REUSEADDR, out_buffer, out_size );
+
default:
{
if ((code >> 16) == FILE_DEVICE_NETWORK)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 15c9d0cc940..11e6719fcb0 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -2090,7 +2090,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
/* Handle common cases. The special cases are below, sorted
* alphabetically */
- case WS_SO_REUSEADDR:
case WS_SO_SNDBUF:
if ( (fd = get_sock_fd( s, 0, NULL )) == -1)
return SOCKET_ERROR;
@@ -2291,6 +2290,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
case WS_SO_RCVTIMEO:
return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_RCVTIMEO, optval, optlen );
+ case WS_SO_REUSEADDR:
+ return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_REUSEADDR, optval, optlen );
+
case WS_SO_SNDTIMEO:
{
INT64 timeout;
diff --git a/include/wine/afd.h b/include/wine/afd.h
index c4f7c7a6413..f337ec361b2 100644
--- a/include/wine/afd.h
+++ b/include/wine/afd.h
@@ -173,6 +173,7 @@ struct afd_get_events_params
#define IOCTL_AFD_WINE_GET_SO_RCVBUF CTL_CODE(FILE_DEVICE_NETWORK, 230, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define IOCTL_AFD_WINE_SET_SO_RCVTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 231, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define IOCTL_AFD_WINE_GET_SO_RCVTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 232, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_AFD_WINE_GET_SO_REUSEADDR CTL_CODE(FILE_DEVICE_NETWORK, 233, METHOD_BUFFERED, FILE_ANY_ACCESS)
struct afd_create_params
{
--
2.30.2
More information about the wine-devel
mailing list