[PATCH 0/1] MR6021: nsiproxy.sys: Use net.inet.tcp.pcblist64 to enumerate connections on macOS.

[Tim Clem (＠tclem)]

The handles returned by libproc (namely struct socket_info's soi_pcb)
use all 64 bits, but the ones from the pcblist sysctl are truncated
to 32. That makes find_owning_pid fail. The pcblist64 sysctl was
added in macOS 10.6 and returns handles that match those from
libproc.

--

There does not seem to be a MIB constant for pcblist64, so I had to fetch it with sysctlbyname.

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

[PATCH 1/1] nsiproxy.sys: Use net.inet.tcp.pcblist64 to enumerate connections on macOS.

[Tim Clem]

From: Tim Clem <tclem(a)codeweavers.com>

The handles returned by libproc (namely struct socket_info's soi_pcb)
use all 64 bits, but the ones from the pcblist sysctl are truncated
to 32. That makes find_owning_pid fail. The pcblist64 sysctl was
added in macOS 10.6 and returns handles that match those from
libproc.
---
 dlls/nsiproxy.sys/tcp.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c
index 5734c4d9ee0..5261a715548 100644
--- a/dlls/nsiproxy.sys/tcp.c
+++ b/dlls/nsiproxy.sys/tcp.c
@@ -630,12 +630,21 @@ static NTSTATUS tcp_conns_enumerate_all( UINT filter, struct nsi_tcp_conn_key *k
         char *buf = NULL;
         struct xinpgen *xig, *orig_xig;
 
+#ifdef __APPLE__
+        if (sysctlbyname( "net.inet.tcp.pcblist64", NULL, &len, NULL, 0 ) < 0)
+        {
+            ERR( "Failure to read net.inet.tcp.pcblist64 via sysctl\n" );
+            status = STATUS_NOT_SUPPORTED;
+            goto err;
+        }
+#else
         if (sysctl( mib, ARRAY_SIZE(mib), NULL, &len, NULL, 0 ) < 0)
         {
             ERR( "Failure to read net.inet.tcp.pcblist via sysctl\n" );
             status = STATUS_NOT_SUPPORTED;
             goto err;
         }
+#endif
 
         buf = malloc( len );
         if (!buf)
@@ -664,7 +673,11 @@ static NTSTATUS tcp_conns_enumerate_all( UINT filter, struct nsi_tcp_conn_key *k
              xig->xig_len > sizeof(struct xinpgen);
              xig = (struct xinpgen *)((char *)xig + xig->xig_len))
         {
-#if __FreeBSD_version >= 1200026
+#ifdef __APPLE__
+            struct xtcpcb64 *tcp = (struct xtcpcb64 *)xig;
+            struct xinpcb64 *in = &tcp->xt_inpcb;
+            struct xsocket64 *sock = &in->xi_socket;
+#elif __FreeBSD_version >= 1200026
             struct xtcpcb *tcp = (struct xtcpcb *)xig;
             struct xinpcb *in = &tcp->xt_inp;
             struct xsocket *sock = &in->xi_socket;
-- 
GitLab

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

[PATCH 1/1] nsiproxy.sys: Use net.inet.tcp.pcblist64 to enumerate connections on macOS.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=146885

Your paranoid android.


=== debian11b (64 bit WoW report) ===

user32:
win.c:4037: Test failed: Expected active window 0000000003750160, got 0000000004520182.
win.c:4038: Test failed: Expected focus window 0000000003750160, got 0000000004520182.

[Huw Davies (＠huw)]

Looks fine.

Question: is it worth using `sysctlnametomib()` and caching the returned mib to then use in subsequent calls to `sysctl()`?  I know we don't elsewhere, but I thought I'd ask.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6021#note_75531

[Huw Davies (＠huw)]

> Looks fine.

Actually, no it doesn't.  The first call returns the length, you'd presumably need to replace the second call further down (perhaps even more reason to cache the mib).

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6021#note_75536