Commit 38a6ac7a authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

ws2_32: Move the setsockopt(IP_PKTINFO) implementation to ntdll.

parent bbfe3507
...@@ -1773,9 +1773,15 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc ...@@ -1773,9 +1773,15 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
#ifdef IP_PKTINFO #ifdef IP_PKTINFO
case IOCTL_AFD_WINE_GET_IP_PKTINFO: case IOCTL_AFD_WINE_GET_IP_PKTINFO:
return do_getsockopt( handle, io, IPPROTO_IP, IP_PKTINFO, out_buffer, out_size ); return do_getsockopt( handle, io, IPPROTO_IP, IP_PKTINFO, out_buffer, out_size );
case IOCTL_AFD_WINE_SET_IP_PKTINFO:
return do_setsockopt( handle, io, IPPROTO_IP, IP_PKTINFO, in_buffer, in_size );
#elif defined(IP_RECVDSTADDR) #elif defined(IP_RECVDSTADDR)
case IOCTL_AFD_WINE_GET_IP_PKTINFO: case IOCTL_AFD_WINE_GET_IP_PKTINFO:
return do_getsockopt( handle, io, IPPROTO_IP, IP_RECVDSTADDR, out_buffer, out_size ); return do_getsockopt( handle, io, IPPROTO_IP, IP_RECVDSTADDR, out_buffer, out_size );
case IOCTL_AFD_WINE_SET_IP_PKTINFO:
return do_setsockopt( handle, io, IPPROTO_IP, IP_RECVDSTADDR, in_buffer, in_size );
#endif #endif
default: default:
......
...@@ -3666,6 +3666,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, ...@@ -3666,6 +3666,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
case WS_IP_OPTIONS: case WS_IP_OPTIONS:
return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_OPTIONS, optval, optlen ); return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_OPTIONS, optval, optlen );
case WS_IP_PKTINFO:
return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_PKTINFO, optval, optlen );
case WS_IP_UNBLOCK_SOURCE: case WS_IP_UNBLOCK_SOURCE:
{ {
WS_IP_MREQ_SOURCE* val = (void*)optval; WS_IP_MREQ_SOURCE* val = (void*)optval;
...@@ -3679,9 +3682,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, ...@@ -3679,9 +3682,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
convert_sockopt(&level, &optname); convert_sockopt(&level, &optname);
break; break;
} }
#if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR)
case WS_IP_PKTINFO:
#endif
case WS_IP_TOS: case WS_IP_TOS:
case WS_IP_TTL: case WS_IP_TTL:
#ifdef IP_UNICAST_IF #ifdef IP_UNICAST_IF
......
...@@ -199,6 +199,7 @@ struct afd_get_events_params ...@@ -199,6 +199,7 @@ struct afd_get_events_params
#define IOCTL_AFD_WINE_GET_IP_OPTIONS WINE_AFD_IOC(254) #define IOCTL_AFD_WINE_GET_IP_OPTIONS WINE_AFD_IOC(254)
#define IOCTL_AFD_WINE_SET_IP_OPTIONS WINE_AFD_IOC(255) #define IOCTL_AFD_WINE_SET_IP_OPTIONS WINE_AFD_IOC(255)
#define IOCTL_AFD_WINE_GET_IP_PKTINFO WINE_AFD_IOC(256) #define IOCTL_AFD_WINE_GET_IP_PKTINFO WINE_AFD_IOC(256)
#define IOCTL_AFD_WINE_SET_IP_PKTINFO WINE_AFD_IOC(257)
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