Commit 5819c52f authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

ws2_32: Move the getsockopt(IP_UNICAST_IF) implementation to ntdll.

parent 9715bd25
...@@ -88,6 +88,10 @@ ...@@ -88,6 +88,10 @@
#define TCP_KEEPIDLE TCP_KEEPALIVE #define TCP_KEEPIDLE TCP_KEEPALIVE
#endif #endif
#if defined(linux) && !defined(IP_UNICAST_IF)
#define IP_UNICAST_IF 50
#endif
WINE_DEFAULT_DEBUG_CHANNEL(winsock); WINE_DEFAULT_DEBUG_CHANNEL(winsock);
#define FILE_USE_FILE_POINTER_POSITION ((LONGLONG)-2) #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 ...@@ -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: case IOCTL_AFD_WINE_SET_IP_UNBLOCK_SOURCE:
return do_setsockopt( handle, io, IPPROTO_IP, IP_UNBLOCK_SOURCE, in_buffer, in_size ); 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: default:
{ {
if ((code >> 16) == FILE_DEVICE_NETWORK) if ((code >> 16) == FILE_DEVICE_NETWORK)
......
...@@ -2495,19 +2495,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, ...@@ -2495,19 +2495,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
case WS_IP_TTL: case WS_IP_TTL:
return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_TTL, optval, optlen ); return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_TTL, optval, optlen );
#ifdef IP_UNICAST_IF
case WS_IP_UNICAST_IF: case WS_IP_UNICAST_IF:
#endif return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_UNICAST_IF, optval, optlen );
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;
default: default:
FIXME( "unrecognized IP option %u\n", optname ); FIXME( "unrecognized IP option %u\n", optname );
......
...@@ -205,6 +205,7 @@ struct afd_get_events_params ...@@ -205,6 +205,7 @@ struct afd_get_events_params
#define IOCTL_AFD_WINE_GET_IP_TTL WINE_AFD_IOC(260) #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_TTL WINE_AFD_IOC(261)
#define IOCTL_AFD_WINE_SET_IP_UNBLOCK_SOURCE WINE_AFD_IOC(262) #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 struct afd_create_params
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment