[PATCH 1/4] ntdll: Add missing break to case IPV6_PKTINFO
Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- It looks like I lost the break statement in rebasing, sorry. --- dlls/ntdll/unix/socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 4f1b9a468eb..35c846eb7ae 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -458,6 +458,7 @@ static int convert_control_headers(struct msghdr *hdr, WSABUF *control) ptr = fill_control_message( WS_IPPROTO_IPV6, WS_IPV6_PKTINFO, ptr, &ctlsize, (void *)&data_win, sizeof(data_win) ); if (!ptr) goto error; + break; } #endif /* IPV6_PKTINFO */ -- 2.32.0
Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- include/ws2ipdef.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index 0938db2db9f..d5a4dab6ce0 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -207,6 +207,17 @@ typedef struct WS(in6_pktinfo) { #define IPV6_UNICAST_IF 31 #define IPV6_RTHDR 32 #define IPV6_RECVRTHDR 38 +#define IPV6_TCLASS 39 +#define IPV6_RECVTCLASS 40 +#define IPV6_ECN 50 +#define IPV6_PKTINFO_EX 51 +#define IPV6_WFP_REDIRECT_RECORDS 60 +#define IPV6_WFP_REDIRECT_CONTEXT 70 +#define IPV6_MTU_DISCOVER 71 +#define IPV6_MTU 72 +#define IPV6_NRT_INTERFACE 74 +#define IPV6_RECVERR 75 +#define IPV6_USER_MTU 76 #else #define WS_IPV6_OPTIONS 1 #define WS_IPV6_HDRINCL 2 @@ -231,6 +242,17 @@ typedef struct WS(in6_pktinfo) { #define WS_IPV6_UNICAST_IF 31 #define WS_IPV6_RTHDR 32 #define WS_IPV6_RECVRTHDR 38 +#define WS_IPV6_TCLASS 39 +#define WS_IPV6_RECVTCLASS 40 +#define WS_IPV6_ECN 50 +#define WS_IPV6_PKTINFO_EX 51 +#define WS_IPV6_WFP_REDIRECT_RECORDS 60 +#define WS_IPV6_WFP_REDIRECT_CONTEXT 70 +#define WS_IPV6_MTU_DISCOVER 71 +#define WS_IPV6_MTU 72 +#define WS_IPV6_NRT_INTERFACE 74 +#define WS_IPV6_RECVERR 75 +#define WS_IPV6_USER_MTU 76 #endif /* USE_WS_PREFIX */ #ifndef USE_WS_PREFIX -- 2.32.0
Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- The Warface downloader from bug 47047 sets this option. --- dlls/ntdll/unix/socket.c | 8 ++++++++ dlls/ws2_32/socket.c | 7 +++++++ include/wine/afd.h | 2 ++ 3 files changed, 17 insertions(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 35c846eb7ae..ead6c44a233 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1916,6 +1916,14 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_RECVPKTINFO, in_buffer, in_size ); #endif +#ifdef IPV6_TCLASS + case IOCTL_AFD_WINE_GET_IPV6_TCLASS: + return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_TCLASS, out_buffer, out_size ); + + case IOCTL_AFD_WINE_SET_IPV6_TCLASS: + return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_TCLASS, in_buffer, in_size ); +#endif + case IOCTL_AFD_WINE_GET_IPV6_UNICAST_HOPS: return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_UNICAST_HOPS, out_buffer, out_size ); diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ca95a1e0321..12617935773 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -314,6 +314,7 @@ static inline const char *debugstr_sockopt(int level, int optname) DEBUG_SOCKOPT(WS_IPV6_MULTICAST_HOPS); DEBUG_SOCKOPT(WS_IPV6_MULTICAST_LOOP); DEBUG_SOCKOPT(WS_IPV6_PKTINFO); + DEBUG_SOCKOPT(WS_IPV6_TCLASS); DEBUG_SOCKOPT(WS_IPV6_UNICAST_HOPS); DEBUG_SOCKOPT(WS_IPV6_V6ONLY); DEBUG_SOCKOPT(WS_IPV6_UNICAST_IF); @@ -1737,6 +1738,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_IPV6_PKTINFO: return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_RECVPKTINFO, optval, optlen ); + case WS_IPV6_TCLASS: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_TCLASS, optval, optlen ); + case WS_IPV6_UNICAST_HOPS: return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_UNICAST_HOPS, optval, optlen ); @@ -2953,6 +2957,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, FIXME("IPV6_PROTECTION_LEVEL is ignored!\n"); return 0; + case WS_IPV6_TCLASS: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_TCLASS, optval, optlen ); + case WS_IPV6_UNICAST_HOPS: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_UNICAST_HOPS, optval, optlen ); diff --git a/include/wine/afd.h b/include/wine/afd.h index caa86eabf83..84dd09bf50b 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -232,6 +232,8 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IPV6_RECVHOPLIMIT WINE_AFD_IOC(287) #define IOCTL_AFD_WINE_GET_IPV6_RECVPKTINFO WINE_AFD_IOC(288) #define IOCTL_AFD_WINE_SET_IPV6_RECVPKTINFO WINE_AFD_IOC(289) +#define IOCTL_AFD_WINE_GET_IPV6_TCLASS WINE_AFD_IOC(290) +#define IOCTL_AFD_WINE_SET_IPV6_TCLASS WINE_AFD_IOC(291) struct afd_create_params { -- 2.32.0
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=95141 Your paranoid android. === debiant2 (32 bit report) === ws2_32: afd.c:336: Test failed: got flags 0x43 afd.c:342: Test failed: got flags 0x41
Could you please add some basic tests, to confirm that setting and retrieving this option succeeds?
Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/unix/socket.c | 18 ++++++++++++++++++ dlls/ws2_32/socket.c | 7 +++++++ dlls/ws2_32/tests/sock.c | 26 ++++++++++++++++++++++++-- include/wine/afd.h | 2 ++ 4 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index ead6c44a233..78ab77fe759 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -462,6 +462,16 @@ static int convert_control_headers(struct msghdr *hdr, WSABUF *control) } #endif /* IPV6_PKTINFO */ +#if defined(IPV6_TCLASS) + case IPV6_TCLASS: + { + ptr = fill_control_message( WS_IPPROTO_IPV6, WS_IPV6_TCLASS, ptr, &ctlsize, + CMSG_DATA(cmsg_unix), sizeof(INT) ); + if (!ptr) goto error; + break; + } +#endif /* IPV6_TCLASS */ + default: FIXME("Unhandled IPPROTO_IPV6 message header type %d\n", cmsg_unix->cmsg_type); break; @@ -1916,6 +1926,14 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_RECVPKTINFO, in_buffer, in_size ); #endif +#ifdef IPV6_RECVTCLASS + case IOCTL_AFD_WINE_GET_IPV6_RECVTCLASS: + return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_RECVTCLASS, out_buffer, out_size ); + + case IOCTL_AFD_WINE_SET_IPV6_RECVTCLASS: + return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_RECVTCLASS, in_buffer, in_size ); +#endif + #ifdef IPV6_TCLASS case IOCTL_AFD_WINE_GET_IPV6_TCLASS: return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_TCLASS, out_buffer, out_size ); diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 12617935773..4ed02c56aba 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -314,6 +314,7 @@ static inline const char *debugstr_sockopt(int level, int optname) DEBUG_SOCKOPT(WS_IPV6_MULTICAST_HOPS); DEBUG_SOCKOPT(WS_IPV6_MULTICAST_LOOP); DEBUG_SOCKOPT(WS_IPV6_PKTINFO); + DEBUG_SOCKOPT(WS_IPV6_RECVTCLASS); DEBUG_SOCKOPT(WS_IPV6_TCLASS); DEBUG_SOCKOPT(WS_IPV6_UNICAST_HOPS); DEBUG_SOCKOPT(WS_IPV6_V6ONLY); @@ -1738,6 +1739,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_IPV6_PKTINFO: return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_RECVPKTINFO, optval, optlen ); + case WS_IPV6_RECVTCLASS: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_RECVTCLASS, optval, optlen ); + case WS_IPV6_TCLASS: return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_TCLASS, optval, optlen ); @@ -2957,6 +2961,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, FIXME("IPV6_PROTECTION_LEVEL is ignored!\n"); return 0; + case WS_IPV6_RECVTCLASS: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_RECVTCLASS, optval, optlen ); + case WS_IPV6_TCLASS: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_TCLASS, optval, optlen ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index dd8c83374d0..6693c469dce 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2002,7 +2002,7 @@ static void test_ipv6_cmsg(void) 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); + INT *int_data = (INT *)WSA_CMSG_DATA(header); IN6_PKTINFO *pkt_info = (IN6_PKTINFO *)WSA_CMSG_DATA(header); DWORD count, state; int rc; @@ -2043,7 +2043,7 @@ static void test_ipv6_cmsg(void) ok(header->cmsg_type == IPV6_HOPLIMIT, "expected IPV6_HOPLIMIT, got %i\n", header->cmsg_type); ok(header->cmsg_len == sizeof(*header) + sizeof(INT), "expected length %i, got %i\n", (INT)(sizeof(*header) + sizeof(INT)), (INT)header->cmsg_len); - ok(*hop_limit >= 32, "expected at least 32, got %i\n", *hop_limit); + ok(*int_data >= 32, "expected at least 32, got %i\n", *int_data); setsockopt(server, IPPROTO_IPV6, IPV6_HOPLIMIT, (const char *)&off, sizeof(off)); ok(!rc, "failed to clear IPV6_HOPLIMIT, error %u\n", WSAGetLastError()); @@ -2069,6 +2069,28 @@ static void test_ipv6_cmsg(void) rc = setsockopt(server, IPPROTO_IPV6, IPV6_PKTINFO, (const char *)&off, sizeof(off)); ok(!rc, "failed to clear IPV6_PKTINFO, error %u\n", WSAGetLastError()); + memset(control, 0, sizeof(control)); + msg.Control.len = sizeof(control); + rc = setsockopt(server, IPPROTO_IPV6, IPV6_RECVTCLASS, (const char *)&on, sizeof(on)); + ok(!rc, "failed to set IPV6_RECVTCLASS, error %u\n", WSAGetLastError()); + state = 0; + count = sizeof(state); + rc = getsockopt(server, IPPROTO_IPV6, IPV6_RECVTCLASS, (char *)&state, (INT *)&count); + ok(!rc, "failed to get IPV6_RECVTCLASS, error %u\n", WSAGetLastError()); + ok(state == 1, "expected 1, got %u\n", state); + 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); + ok(header->cmsg_level == IPPROTO_IPV6, "expected IPPROTO_IPV6, got %i\n", header->cmsg_level); + ok(header->cmsg_type == IPV6_TCLASS, "expected IPV6_TCLASS, got %i\n", header->cmsg_type); + ok(header->cmsg_len == sizeof(*header) + sizeof(INT), + "expected length %i, got %i\n", (INT)(sizeof(*header) + sizeof(INT)), (INT)header->cmsg_len); + ok(*int_data == 0, "expected 0, got %i\n", *int_data); + rc = setsockopt(server, IPPROTO_IPV6, IPV6_RECVTCLASS, (const char *)&off, sizeof(off)); + ok(!rc, "failed to clear IPV6_RECVTCLASS, error %u\n", WSAGetLastError()); + closesocket(server); closesocket(client); } diff --git a/include/wine/afd.h b/include/wine/afd.h index 84dd09bf50b..fb7411d2514 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -234,6 +234,8 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IPV6_RECVPKTINFO WINE_AFD_IOC(289) #define IOCTL_AFD_WINE_GET_IPV6_TCLASS WINE_AFD_IOC(290) #define IOCTL_AFD_WINE_SET_IPV6_TCLASS WINE_AFD_IOC(291) +#define IOCTL_AFD_WINE_GET_IPV6_RECVTCLASS WINE_AFD_IOC(292) +#define IOCTL_AFD_WINE_SET_IPV6_RECVTCLASS WINE_AFD_IOC(293) struct afd_create_params { -- 2.32.0
participants (3)
-
Alex Henrie -
Marvin -
Zebediah Figura (she/her)