[PATCH 3/4] ws2_32: Move the getsockopt(IP_UNICAST_IF) implementation to ntdll.

[Zebediah Figura]

From: Zebediah Figura <z.figura12 at gmail.com>

Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
 dlls/ntdll/unix/socket.c |  9 +++++++++
 dlls/ws2_32/socket.c     | 13 +------------
 include/wine/afd.h       |  1 +
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c
index ffa6a20b0a1..0269c2b78ae 100644
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -88,6 +88,10 @@
 #define TCP_KEEPIDLE TCP_KEEPALIVE
 #endif
 
+#if defined(linux) && !defined(IP_UNICAST_IF)
+#define IP_UNICAST_IF 50
+#endif
+
 WINE_DEFAULT_DEBUG_CHANNEL(winsock);
 
 #define FILE_USE_FILE_POINTER_POSITION ((LONGLONG)-2)
@@ -1790,6 +1794,11 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
         case IOCTL_AFD_WINE_SET_IP_UNBLOCK_SOURCE:
             return do_setsockopt( handle, io, IPPROTO_IP, IP_UNBLOCK_SOURCE, in_buffer, in_size );
 
+#ifdef IP_UNICAST_IF
+        case IOCTL_AFD_WINE_GET_IP_UNICAST_IF:
+            return do_getsockopt( handle, io, IPPROTO_IP, IP_UNICAST_IF, out_buffer, out_size );
+#endif
+
         default:
         {
             if ((code >> 16) == FILE_DEVICE_NETWORK)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 6582f8e0f95..f94558520af 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -2495,19 +2495,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
         case WS_IP_TTL:
             return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_TTL, optval, optlen );
 
-#ifdef IP_UNICAST_IF
         case WS_IP_UNICAST_IF:
-#endif
-            if ( (fd = get_sock_fd( s, 0, NULL )) == -1)
-                return SOCKET_ERROR;
-            convert_sockopt(&level, &optname);
-            if (getsockopt(fd, level, optname, optval, (socklen_t *)optlen) != 0 )
-            {
-                SetLastError(wsaErrno());
-                ret = SOCKET_ERROR;
-            }
-            release_sock_fd( s, fd );
-            return ret;
+            return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_UNICAST_IF, optval, optlen );
 
         default:
             FIXME( "unrecognized IP option %u\n", optname );
diff --git a/include/wine/afd.h b/include/wine/afd.h
index a117bd5d3c5..18e53706fee 100644
--- a/include/wine/afd.h
+++ b/include/wine/afd.h
@@ -205,6 +205,7 @@ struct afd_get_events_params
 #define IOCTL_AFD_WINE_GET_IP_TTL                       WINE_AFD_IOC(260)
 #define IOCTL_AFD_WINE_SET_IP_TTL                       WINE_AFD_IOC(261)
 #define IOCTL_AFD_WINE_SET_IP_UNBLOCK_SOURCE            WINE_AFD_IOC(262)
+#define IOCTL_AFD_WINE_GET_IP_UNICAST_IF                WINE_AFD_IOC(263)
 
 struct afd_create_params
 {
-- 
2.30.2