Signed-off-by: Alex Henrie alexhenrie24@gmail.com --- include/ws2ipdef.h | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index fc465804962..4e1ec373f71 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -177,6 +177,11 @@ typedef struct WS(in_pktinfo) { UINT ipi_ifindex; } IN_PKTINFO, *PIN_PKTINFO;
+typedef struct WS(in6_pktinfo) { + IN6_ADDR ipi6_addr; + ULONG ipi6_ifindex; +} IN6_PKTINFO, *PIN6_PKTINFO; + #ifndef USE_WS_PREFIX #define IPV6_OPTIONS 1 #define IPV6_HDRINCL 2
Signed-off-by: Alex Henrie alexhenrie24@gmail.com --- dlls/ws2_32/tests/sock.c | 87 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 1 deletion(-)
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 592baa806c3..101e0d24889 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -154,6 +154,7 @@ static DWORD thread_id[1+MAX_CLIENTS]; static HANDLE server_ready; static HANDLE client_ready[MAX_CLIENTS]; static int client_id; +static GUID WSARecvMsg_GUID = WSAID_WSARECVMSG;
/**************** General utility functions ***************/
@@ -1801,7 +1802,6 @@ static void test_ip_pktinfo(void) ULONG addresses[2] = {inet_addr("127.0.0.1"), htonl(INADDR_ANY)}; char recvbuf[10], pktbuf[512], msg[] = "HELLO"; struct sockaddr_in s1addr, s2addr, s3addr; - GUID WSARecvMsg_GUID = WSAID_WSARECVMSG; LPFN_WSARECVMSG pWSARecvMsg = NULL; unsigned int rc, yes = 1; BOOL foundhdr; @@ -1989,6 +1989,90 @@ static void test_ip_pktinfo(void) CloseHandle(ov.hEvent); }
+static void test_ipv6_cmsg(void) +{ + static const DWORD off = 0; + static const DWORD on = 1; + SOCKADDR_IN6 localhost = {0}; + SOCKET client, server; + char payload[] = "HELLO"; + char control[100]; + WSABUF payload_buf = {sizeof(payload), payload}; + WSAMSG msg = {NULL, 0, &payload_buf, 1, {sizeof(control), control}, 0}; + WSACMSGHDR *header = (WSACMSGHDR *)control; + LPFN_WSARECVMSG pWSARecvMsg; + INT *hop_limit = (INT *)WSA_CMSG_DATA(header); + IN6_PKTINFO *pkt_info = (IN6_PKTINFO *)WSA_CMSG_DATA(header); + DWORD count; + int rc; + + localhost.sin6_family = AF_INET6; + localhost.sin6_port = htons(SERVERPORT); + inet_pton(AF_INET6, "::1", &localhost.sin6_addr); + + client = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP); + ok(client != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); + server = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP); + ok(server != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); + + rc = bind(server, (SOCKADDR *)&localhost, sizeof(localhost)); + ok(rc != SOCKET_ERROR, "bind failed, error %u\n", WSAGetLastError()); + rc = connect(client, (SOCKADDR *)&localhost, sizeof(localhost)); + ok(rc != SOCKET_ERROR, "connect failed, error %u\n", WSAGetLastError()); + + rc = WSAIoctl(server, SIO_GET_EXTENSION_FUNCTION_POINTER, &WSARecvMsg_GUID, sizeof(WSARecvMsg_GUID), + &pWSARecvMsg, sizeof(pWSARecvMsg), &count, NULL, NULL); + ok(!rc, "failed to get WSARecvMsg, error %u\n", WSAGetLastError()); + + memset(control, 0, sizeof(control)); + msg.Control.len = sizeof(control); + rc = setsockopt(server, IPPROTO_IPV6, IPV6_HOPLIMIT, (const char *)&on, sizeof(on)); +todo_wine + ok(!rc, "failed to set IPV6_HOPLIMIT, error %u\n", WSAGetLastError()); + rc = send(client, payload, sizeof(payload), 0); + ok(rc == sizeof(payload), "send failed, error %u\n", WSAGetLastError()); + rc = pWSARecvMsg(server, &msg, &count, NULL, NULL); + ok(!rc, "WSARecvMsg failed, error %u\n", WSAGetLastError()); + ok(count == sizeof(payload), "expected length %i, got %i\n", (INT)sizeof(payload), count); +todo_wine + ok(header->cmsg_level == IPPROTO_IPV6, "expected IPPROTO_IPV6, got %i\n", header->cmsg_level); +todo_wine + ok(header->cmsg_type == IPV6_HOPLIMIT, "expected IPV6_HOPLIMIT, got %i\n", header->cmsg_type); +todo_wine + ok(header->cmsg_len == sizeof(*header) + sizeof(INT), + "expected length %i, got %i\n", (INT)(sizeof(*header) + sizeof(INT)), (INT)header->cmsg_len); +todo_wine + ok(*hop_limit >= 32, "expected at least 32, got %i\n", *hop_limit); + setsockopt(server, IPPROTO_IPV6, IPV6_HOPLIMIT, (const char *)&off, sizeof(off)); + ok(!rc, "failed to clear IPV6_HOPLIMIT, error %u\n", WSAGetLastError()); + + memset(control, 0, sizeof(control)); + msg.Control.len = sizeof(control); + rc = setsockopt(server, IPPROTO_IPV6, IPV6_PKTINFO, (const char *)&on, sizeof(on)); +todo_wine + ok(!rc, "failed to set IPV6_PKTINFO, error %u\n", WSAGetLastError()); + rc = send(client, payload, sizeof(payload), 0); + ok(rc == sizeof(payload), "send failed, error %u\n", WSAGetLastError()); + rc = pWSARecvMsg(server, &msg, &count, NULL, NULL); + ok(!rc, "WSARecvMsg failed, error %u\n", WSAGetLastError()); + ok(count == sizeof(payload), "expected length %i, got %i\n", (INT)sizeof(payload), count); +todo_wine + ok(header->cmsg_level == IPPROTO_IPV6, "expected IPPROTO_IPV6, got %i\n", header->cmsg_level); +todo_wine + ok(header->cmsg_type == IPV6_PKTINFO, "expected IPV6_PKTINFO, got %i\n", header->cmsg_type); +todo_wine + ok(header->cmsg_len == sizeof(*header) + sizeof(IN6_PKTINFO), + "expected length %i, got %i\n", (INT)(sizeof(*header) + sizeof(IN6_PKTINFO)), (INT)header->cmsg_len); +todo_wine + ok(!memcmp(&pkt_info->ipi6_addr, &localhost.sin6_addr, sizeof(IN6_ADDR)), "expected ::1\n"); + rc = setsockopt(server, IPPROTO_IPV6, IPV6_PKTINFO, (const char *)&off, sizeof(off)); +todo_wine + ok(!rc, "failed to clear IPV6_PKTINFO, error %u\n", WSAGetLastError()); + + closesocket(server); + closesocket(client); +} + /************* Array containing the tests to run **********/
#define STD_STREAM_SOCKET \ @@ -10760,6 +10844,7 @@ START_TEST( sock ) test_set_getsockopt(); test_so_reuseaddr(); test_ip_pktinfo(); + test_ipv6_cmsg(); test_extendedSocketOptions();
for (i = 0; i < ARRAY_SIZE(tests); i++)
Signed-off-by: Alex Henrie alexhenrie24@gmail.com --- FelgoLiveClient.exe from https://felgo.com/ sets this option.
v2: Map WS_IPV6_HOPLIMIT to IPV6_RECVHOPLIMIT. RFC 2292 originally defined IPV6_HOPLIMIT as both an integer option for packets and as a boolean option for sockets, but RFC 3542 changed it to be only an integer per-packet option and created a new IPV6_RECVHOPIMIT boolean option for sockets. --- dlls/ntdll/unix/socket.c | 22 +++++++++++++++++++++- dlls/ws2_32/socket.c | 10 ++++++++++ dlls/ws2_32/tests/sock.c | 5 ----- dlls/ws2_32/ws2_32_private.h | 1 + 4 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index e5f4862bf3c..58e3bb308fe 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -32,7 +32,8 @@ #include <sys/socket.h> #endif #ifdef HAVE_NETINET_IN_H -#include <netinet/in.h> +# define __APPLE_USE_RFC_3542 +# include <netinet/in.h> #endif
#ifdef HAVE_NETIPX_IPX_H @@ -443,6 +444,25 @@ static int convert_control_headers(struct msghdr *hdr, WSABUF *control) } break;
+ case IPPROTO_IPV6: + switch (cmsg_unix->cmsg_type) + { +#if defined(IPV6_HOPLIMIT) + case IPV6_HOPLIMIT: + { + ptr = fill_control_message( WS_IPPROTO_IPV6, WS_IPV6_HOPLIMIT, ptr, &ctlsize, + CMSG_DATA(cmsg_unix), sizeof(INT) ); + if (!ptr) goto error; + break; + } +#endif /* IPV6_HOPLIMIT */ + + default: + FIXME("Unhandled IPPROTO_IPV6 message header type %d\n", cmsg_unix->cmsg_type); + break; + } + break; + default: FIXME("Unhandled message header level %d\n", cmsg_unix->cmsg_level); break; diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index bfe5ab186ee..6cd1991c650 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -357,6 +357,7 @@ static inline const char *debugstr_sockopt(int level, int optname) { DEBUG_SOCKOPT(WS_IPV6_ADD_MEMBERSHIP); DEBUG_SOCKOPT(WS_IPV6_DROP_MEMBERSHIP); + DEBUG_SOCKOPT(WS_IPV6_HOPLIMIT); DEBUG_SOCKOPT(WS_IPV6_MULTICAST_IF); DEBUG_SOCKOPT(WS_IPV6_MULTICAST_HOPS); DEBUG_SOCKOPT(WS_IPV6_MULTICAST_LOOP); @@ -545,6 +546,9 @@ static const int ws_ipv6_map[][2] = #endif #ifdef IPV6_DROP_MEMBERSHIP MAP_OPTION( IPV6_DROP_MEMBERSHIP ), +#endif +#ifdef IPV6_RECVHOPLIMIT + { WS_IPV6_HOPLIMIT, IPV6_RECVHOPLIMIT }, #endif MAP_OPTION( IPV6_MULTICAST_IF ), MAP_OPTION( IPV6_MULTICAST_HOPS ), @@ -3010,6 +3014,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, #endif #ifdef IPV6_DROP_MEMBERSHIP case WS_IPV6_DROP_MEMBERSHIP: +#endif +#ifdef IPV6_RECVHOPLIMIT + case WS_IPV6_HOPLIMIT: #endif case WS_IPV6_MULTICAST_IF: case WS_IPV6_MULTICAST_HOPS: @@ -4400,6 +4407,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, #endif #ifdef IPV6_DROP_MEMBERSHIP case WS_IPV6_DROP_MEMBERSHIP: +#endif +#ifdef IPV6_RECVHOPLIMIT + case WS_IPV6_HOPLIMIT: #endif case WS_IPV6_MULTICAST_IF: case WS_IPV6_MULTICAST_HOPS: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 101e0d24889..0126b9299ed 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2027,21 +2027,16 @@ static void test_ipv6_cmsg(void) memset(control, 0, sizeof(control)); msg.Control.len = sizeof(control); rc = setsockopt(server, IPPROTO_IPV6, IPV6_HOPLIMIT, (const char *)&on, sizeof(on)); -todo_wine ok(!rc, "failed to set IPV6_HOPLIMIT, error %u\n", WSAGetLastError()); rc = send(client, payload, sizeof(payload), 0); ok(rc == sizeof(payload), "send failed, error %u\n", WSAGetLastError()); rc = pWSARecvMsg(server, &msg, &count, NULL, NULL); ok(!rc, "WSARecvMsg failed, error %u\n", WSAGetLastError()); ok(count == sizeof(payload), "expected length %i, got %i\n", (INT)sizeof(payload), count); -todo_wine ok(header->cmsg_level == IPPROTO_IPV6, "expected IPPROTO_IPV6, got %i\n", header->cmsg_level); -todo_wine ok(header->cmsg_type == IPV6_HOPLIMIT, "expected IPV6_HOPLIMIT, got %i\n", header->cmsg_type); -todo_wine ok(header->cmsg_len == sizeof(*header) + sizeof(INT), "expected length %i, got %i\n", (INT)(sizeof(*header) + sizeof(INT)), (INT)header->cmsg_len); -todo_wine ok(*hop_limit >= 32, "expected at least 32, got %i\n", *hop_limit); setsockopt(server, IPPROTO_IPV6, IPV6_HOPLIMIT, (const char *)&off, sizeof(off)); ok(!rc, "failed to clear IPV6_HOPLIMIT, error %u\n", WSAGetLastError()); diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index 527dbe903b4..743ae3877bb 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -58,6 +58,7 @@ #include <sys/socket.h> #endif #ifdef HAVE_NETINET_IN_H +# define __APPLE_USE_RFC_3542 # include <netinet/in.h> #endif #ifdef HAVE_NETINET_TCP_H
Signed-off-by: Alex Henrie alexhenrie24@gmail.com --- configure.ac | 7 +++++++ dlls/ntdll/unix/socket.c | 15 +++++++++++++++ dlls/ws2_32/socket.c | 10 ++++++++++ dlls/ws2_32/tests/sock.c | 6 ------ 4 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac index afb4dc7432a..440e03c3251 100644 --- a/configure.ac +++ b/configure.ac @@ -2550,6 +2550,13 @@ AC_CHECK_MEMBERS([struct icmpstat.icps_outhist],,, #include <netinet/icmp_var.h> #endif])
+dnl Check for struct in6_pktinfo +AC_CHECK_MEMBERS([struct in6_pktinfo.ipi6_addr],,, +[#ifdef HAVE_NETINET_IN_H +#define _GNU_SOURCE +#include <netinet/in.h> +#endif]) + dnl Check for struct ipstat AC_CHECK_MEMBERS([struct ipstat.ips_total],,, [#ifdef HAVE_SYS_TYPES_H diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 58e3bb308fe..e42a5befb23 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -23,6 +23,7 @@ #endif
#include "config.h" +#define _GNU_SOURCE /* for struct in6_pktinfo */ #include <errno.h> #include <unistd.h> #ifdef HAVE_SYS_IOCTL_H @@ -457,6 +458,20 @@ static int convert_control_headers(struct msghdr *hdr, WSABUF *control) } #endif /* IPV6_HOPLIMIT */
+#if defined(IPV6_PKTINFO) && defined(HAVE_STRUCT_IN6_PKTINFO_IPI6_ADDR) + case IPV6_PKTINFO: + { + struct in6_pktinfo *data_unix = (struct in6_pktinfo *)CMSG_DATA(cmsg_unix); + struct WS_in6_pktinfo data_win; + + memcpy(&data_win.ipi6_addr, &data_unix->ipi6_addr.s6_addr, 16); + data_win.ipi6_ifindex = data_unix->ipi6_ifindex; + ptr = fill_control_message( WS_IPPROTO_IPV6, WS_IPV6_PKTINFO, ptr, &ctlsize, + (void *)&data_win, sizeof(data_win) ); + if (!ptr) goto error; + } +#endif /* IPV6_PKTINFO */ + default: FIXME("Unhandled IPPROTO_IPV6 message header type %d\n", cmsg_unix->cmsg_type); break; diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 6cd1991c650..75c1a03dc3d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -361,6 +361,7 @@ static inline const char *debugstr_sockopt(int level, int optname) DEBUG_SOCKOPT(WS_IPV6_MULTICAST_IF); DEBUG_SOCKOPT(WS_IPV6_MULTICAST_HOPS); DEBUG_SOCKOPT(WS_IPV6_MULTICAST_LOOP); + DEBUG_SOCKOPT(WS_IPV6_PKTINFO); DEBUG_SOCKOPT(WS_IPV6_UNICAST_HOPS); DEBUG_SOCKOPT(WS_IPV6_V6ONLY); DEBUG_SOCKOPT(WS_IPV6_UNICAST_IF); @@ -553,6 +554,9 @@ static const int ws_ipv6_map[][2] = MAP_OPTION( IPV6_MULTICAST_IF ), MAP_OPTION( IPV6_MULTICAST_HOPS ), MAP_OPTION( IPV6_MULTICAST_LOOP ), +#if defined(IPV6_RECVPKTINFO) + { WS_IPV6_PKTINFO, IPV6_RECVPKTINFO }, +#endif MAP_OPTION( IPV6_UNICAST_HOPS ), MAP_OPTION( IPV6_V6ONLY ), #ifdef IPV6_UNICAST_IF @@ -3021,6 +3025,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_IPV6_MULTICAST_IF: case WS_IPV6_MULTICAST_HOPS: case WS_IPV6_MULTICAST_LOOP: +#ifdef IPV6_RECVPKTINFO + case WS_IPV6_PKTINFO: +#endif case WS_IPV6_UNICAST_HOPS: case WS_IPV6_V6ONLY: #ifdef IPV6_UNICAST_IF @@ -4414,6 +4421,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPV6_MULTICAST_IF: case WS_IPV6_MULTICAST_HOPS: case WS_IPV6_MULTICAST_LOOP: +#ifdef IPV6_RECVPKTINFO + case WS_IPV6_PKTINFO: +#endif case WS_IPV6_UNICAST_HOPS: #ifdef IPV6_UNICAST_IF case WS_IPV6_UNICAST_IF: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 0126b9299ed..5fa1177e778 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2044,24 +2044,18 @@ static void test_ipv6_cmsg(void) memset(control, 0, sizeof(control)); msg.Control.len = sizeof(control); rc = setsockopt(server, IPPROTO_IPV6, IPV6_PKTINFO, (const char *)&on, sizeof(on)); -todo_wine ok(!rc, "failed to set IPV6_PKTINFO, error %u\n", WSAGetLastError()); rc = send(client, payload, sizeof(payload), 0); ok(rc == sizeof(payload), "send failed, error %u\n", WSAGetLastError()); rc = pWSARecvMsg(server, &msg, &count, NULL, NULL); ok(!rc, "WSARecvMsg failed, error %u\n", WSAGetLastError()); ok(count == sizeof(payload), "expected length %i, got %i\n", (INT)sizeof(payload), count); -todo_wine ok(header->cmsg_level == IPPROTO_IPV6, "expected IPPROTO_IPV6, got %i\n", header->cmsg_level); -todo_wine ok(header->cmsg_type == IPV6_PKTINFO, "expected IPV6_PKTINFO, got %i\n", header->cmsg_type); -todo_wine ok(header->cmsg_len == sizeof(*header) + sizeof(IN6_PKTINFO), "expected length %i, got %i\n", (INT)(sizeof(*header) + sizeof(IN6_PKTINFO)), (INT)header->cmsg_len); -todo_wine ok(!memcmp(&pkt_info->ipi6_addr, &localhost.sin6_addr, sizeof(IN6_ADDR)), "expected ::1\n"); rc = setsockopt(server, IPPROTO_IPV6, IPV6_PKTINFO, (const char *)&off, sizeof(off)); -todo_wine ok(!rc, "failed to clear IPV6_PKTINFO, error %u\n", WSAGetLastError());
closesocket(server);
-
Alex Henrie