[PATCH 0/1] MR192: ws2_32: Allow getsockname after AcceptEx

[DavidCurtiss (＠DavidCurtiss)]

.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(a)ni.com>

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/192

[PATCH 1/1] ws2_32: Allow getsockname after AcceptEx

[David Curtiss]

From: David Curtiss <david.curtiss(a)ni.com>

.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(a)ni.com>
---
 dlls/ws2_32/tests/sock.c | 9 +++++++++
 server/sock.c            | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index 4a4a3a84e51..7eba12dee37 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -8064,6 +8064,15 @@ static void test_AcceptEx(void)
     ok(bret, "GetOverlappedResult failed, error %ld\n", GetLastError());
     ok(bytesReturned == 0, "bytesReturned isn't supposed to be %ld\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 %ld\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);
     connector = INVALID_SOCKET;
     closesocket(acceptor);
diff --git a/server/sock.c b/server/sock.c
index 77a88a7fcf7..db63c505770 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -2716,7 +2716,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async )
     }
 
     case IOCTL_AFD_GETSOCKNAME:
-        if (!sock->bound)
+        if (!sock->addr_len)
         {
             set_error( STATUS_INVALID_PARAMETER );
             return;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/192

[PATCH 1/1] ws2_32: Allow getsockname after AcceptEx

[Zebediah Figura]

Hello David, thanks for the patch!

On 6/6/22 16:53, David Curtiss wrote:
> diff --git a/server/sock.c b/server/sock.c
> index 77a88a7fcf7..db63c505770 100644
> --- a/server/sock.c
> +++ b/server/sock.c
> @@ -2716,7 +2716,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async )
>       }
>
> case IOCTL_AFD_GETSOCKNAME:
> -        if (!sock->bound)
> +        if (!sock->addr_len)
>           {
>               set_error( STATUS_INVALID_PARAMETER );
>               return;

I believe the correct thing to do is rather to make sure that 
sock->bound is set for sockets successfully used with AcceptEx(), i.e. 
in accept_into_socket().