niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

ws2_32: Allow getsockname after AcceptEx.

Browse source 
.NET 6's HTTP/Socket code queries this. Winsock allows getsockname
on the AcceptEx AcceptSocket, but only if SO_UPDATE_ACCEPT_CONTEXT
is set.

Signed-off-by: David Curtiss <david.curtiss@ni.com>
(cherry picked from commit 68d4643a67)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
This commit is contained in:
David Curtiss 2022-06-06 15:34:12 -05:00 • committed by Alexandre Julliard
parent 4cf98d91cf
commit 88c2d88df0
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dlls/ws2_32/tests/sock.c
View file

@ -7507,6 +7507,15 @@ todo_wine
ok(bret, "GetOverlappedResult failed, error %d\n", GetLastError()); ok(bret, "GetOverlappedResult failed, error %d\n", GetLastError());
ok(bytesReturned == 0, "bytesReturned isn't supposed to be %d\n", bytesReturned); ok(bytesReturned == 0, "bytesReturned isn't supposed to be %d\n", bytesReturned);
/* Try to call getsockname on the acceptor socket.
*
* On Windows, this requires setting SO_UPDATE_ACCEPT_CONTEXT. */
iret = setsockopt(acceptor, SOL_SOCKET, SO_UPDATE_ACCEPT_CONTEXT, (char *)&listener, sizeof(SOCKET));
ok(!iret, "Failed to set accept context %d\n", GetLastError());
iret = getsockname(acceptor, (struct sockaddr *)&peerAddress, &remoteSize);
ok(!iret, "getsockname failed.\n");
ok(remoteSize == sizeof(struct sockaddr_in), "got remote size %u\n", remoteSize);
closesocket(connector); closesocket(connector);
connector = INVALID_SOCKET; connector = INVALID_SOCKET;
closesocket(acceptor); closesocket(acceptor);

1
server/sock.c
View file

@ -1785,6 +1785,7 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock )
} }
acceptsock->state = SOCK_CONNECTED; acceptsock->state = SOCK_CONNECTED;
acceptsock->bound = 1;
acceptsock->pending_events = 0; acceptsock->pending_events = 0;
acceptsock->reported_events = 0; acceptsock->reported_events = 0;
acceptsock->proto = sock->proto; acceptsock->proto = sock->proto;