[3/3] ws2_32: Always return the source address from WSAAccept.
Hans Leidekker
hans at codeweavers.com
Tue Oct 1 04:37:28 CDT 2013
---
dlls/ws2_32/socket.c | 9 +--------
dlls/ws2_32/tests/sock.c | 6 +++---
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index c34de4b..6855298 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -6546,12 +6546,8 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr *addr, LPINT addrlen,
TRACE("Socket %04lx, sockaddr %p, addrlen %p, fnCondition %p, dwCallbackData %ld\n",
s, addr, addrlen, lpfnCondition, dwCallbackData);
-
- size = sizeof(src_addr);
- cs = WS_accept(s, &src_addr, &size);
-
+ cs = WS_accept(s, addr, addrlen);
if (cs == SOCKET_ERROR) return SOCKET_ERROR;
-
if (!lpfnCondition) return cs;
CallerId.buf = (char *)&src_addr;
@@ -6565,15 +6561,12 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr *addr, LPINT addrlen,
CalleeId.buf = (char *)&dst_addr;
CalleeId.len = sizeof(dst_addr);
-
ret = (*lpfnCondition)(&CallerId, &CallerData, NULL, NULL,
&CalleeId, &CalleeData, &g, dwCallbackData);
switch (ret)
{
case CF_ACCEPT:
- if (addr && addrlen)
- memcpy(addr, &src_addr, (*addrlen > size) ? size : *addrlen );
return cs;
case CF_DEFER:
SERVER_START_REQ( set_socket_deferred )
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index b413aba..7bee0ca 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -3172,7 +3172,7 @@ static void test_accept(void)
socklen = 0;
accepted = WSAAccept(server_socket, (struct sockaddr *)&ss, &socklen, NULL, 0);
- todo_wine ok(accepted == INVALID_SOCKET && WSAGetLastError() == WSAEFAULT, "got %d\n", WSAGetLastError());
+ ok(accepted == INVALID_SOCKET && WSAGetLastError() == WSAEFAULT, "got %d\n", WSAGetLastError());
ok(!socklen, "got %d\n", socklen);
closesocket(connector);
@@ -3186,8 +3186,8 @@ static void test_accept(void)
memset(&ss, 0, sizeof(ss));
accepted = WSAAccept(server_socket, (struct sockaddr *)&ss, &socklen, NULL, 0);
ok(accepted != INVALID_SOCKET, "Failed to accept connection, %d\n", WSAGetLastError());
- todo_wine ok(socklen != sizeof(ss), "unexpected length\n");
- todo_wine ok(ss.ss_family, "family not set\n");
+ ok(socklen != sizeof(ss), "unexpected length\n");
+ ok(ss.ss_family, "family not set\n");
closesocket(accepted);
closesocket(connector);
--
1.8.1.5
More information about the wine-patches
mailing list