[PATCH 0/2] MR8048: nsiproxy: Implement change notifications for NSI_IP_UNICAST_TABLE on macOS.

[Brendan Shanks (＠bshanks)]

Enables `NotifyAddrChange()` to work on macOS.

[PATCH 1/2] nsiproxy: Set the name of internal threads.

[Brendan Shanks]

From: Brendan Shanks

---
 dlls/nsiproxy.sys/device.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c
index c64f61ed0fe..fe12ba6544b 100644
--- a/dlls/nsiproxy.sys/device.c
+++ b/dlls/nsiproxy.sys/device.c
@@ -457,6 +457,8 @@ static DWORD WINAPI request_thread_proc( void *arg )
 {
     LIST_ENTRY *entry;

+    SetThreadDescription( GetCurrentThread(), L"wine_nsi_request" );
+
     while (WaitForSingleObject( request_event, INFINITE ) == WAIT_OBJECT_0)
     {
         TRACE( "request_event triggered\n" );
@@ -486,6 +488,8 @@ static DWORD WINAPI notification_thread_proc( void *arg )
     LIST_ENTRY *entry, *next;
     NTSTATUS status;

+    SetThreadDescription( GetCurrentThread(), L"wine_nsi_notification" );
+
     while (!(status = nsiproxy_call( nsi_get_notification, &params )))
     {
         EnterCriticalSection( &nsiproxy_cs );

[PATCH 2/2] nsiproxy: Implement change notifications for NSI_IP_UNICAST_TABLE on macOS.

[Brendan Shanks]

From: Brendan Shanks

---
 dlls/nsiproxy.sys/nsi.c | 84 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 81 insertions(+), 3 deletions(-)

diff --git a/dlls/nsiproxy.sys/nsi.c b/dlls/nsiproxy.sys/nsi.c
index 2f6d2d59573..a13d77a47a6 100644
--- a/dlls/nsiproxy.sys/nsi.c
+++ b/dlls/nsiproxy.sys/nsi.c
@@ -31,6 +31,10 @@
 #ifdef HAVE_LINUX_RTNETLINK_H
 #include <linux/rtnetlink.h>
 #endif
+#ifdef __APPLE__
+#include <sys/ioctl.h>
+#include <sys/kern_event.h>
+#endif

#include "ntstatus.h"
 #define WIN32_NO_STATUS
@@ -156,7 +160,7 @@ static NTSTATUS unix_nsi_get_parameter_ex( void *args )
     return nsi_get_parameter_ex( params );
 }

-#ifdef HAVE_LINUX_RTNETLINK_H
+#if defined(HAVE_LINUX_RTNETLINK_H) || defined(__APPLE__)
 static struct
 {
     const NPI_MODULEID *module;
@@ -182,7 +186,8 @@ static NTSTATUS add_notification( const NPI_MODULEID *module, UINT32 table )
     return STATUS_SUCCESS;
 }

-static NTSTATUS poll_netlink(void)
+#if defined(HAVE_LINUX_RTNETLINK_H)
+static NTSTATUS poll_events(void)
 {
     static int netlink_fd = -1;
     char buffer[PIPE_BUF];
@@ -243,13 +248,86 @@ static NTSTATUS poll_netlink(void)
     }
     return STATUS_SUCCESS;
 }
+#elif defined(__APPLE__)
+static NTSTATUS poll_events(void)
+{
+    static int sock = -1;
+
+    if (sock == -1)
+    {
+        static const struct kev_request req =
+        {
+            .vendor_code = KEV_VENDOR_APPLE,
+            .kev_class = KEV_NETWORK_CLASS,
+            .kev_subclass = KEV_ANY_SUBCLASS,
+        };
+
+        if ((sock = socket( PF_SYSTEM, SOCK_RAW, SYSPROTO_EVENT )) == -1)
+        {
+            ERR( "PF_SYSTEM socket creation failed, errno %d.\n", errno );
+            return STATUS_NOT_IMPLEMENTED;
+        }
+
+        if (ioctl( sock, SIOCSKEVFILT, &req ) == -1)
+        {
+            close( sock );
+            sock = -1;
+            ERR( "SIOCSKEVFILT failed, errno %d.\n", errno );
+            return STATUS_NOT_IMPLEMENTED;
+        }
+    }
+
+    while (1)
+    {
+        struct kern_event_msg msg;
+        NTSTATUS status;
+        int len;
+
+        len = recv( sock, &msg, sizeof(msg), 0 );
+        if (len < sizeof(msg))
+        {
+            if (errno == EINTR) continue;
+            ERR( "error receiving, len %d, errno %d.\n", len, errno );
+            return STATUS_UNSUCCESSFUL;
+        }
+
+        if (msg.kev_subclass == KEV_INET_SUBCLASS)
+        {
+            switch (msg.event_code)
+            {
+                case KEV_INET_NEW_ADDR:
+                case KEV_INET_CHANGED_ADDR:
+                case KEV_INET_ADDR_DELETED:
+                    if ((status = add_notification( &NPI_MS_IPV4_MODULEID, NSI_IP_UNICAST_TABLE))) return status;
+                    break;
+            }
+        }
+        else if (msg.kev_subclass == KEV_INET6_SUBCLASS)
+        {
+            switch (msg.event_code)
+            {
+                case KEV_INET6_NEW_USER_ADDR:
+                case KEV_INET6_CHANGED_ADDR:
+                case KEV_INET6_ADDR_DELETED:
+                case KEV_INET6_NEW_LL_ADDR:
+                case KEV_INET6_NEW_RTADV_ADDR:
+                    if ((status = add_notification( &NPI_MS_IPV6_MODULEID, NSI_IP_UNICAST_TABLE))) return status;
+                    break;
+            }
+        }
+        if (queued_notification_count) break;
+    }
+
+    return STATUS_SUCCESS;
+}
+#endif

static NTSTATUS unix_nsi_get_notification( void *args )
 {
     struct nsi_get_notification_params *params = (struct nsi_get_notification_params *)args;
     NTSTATUS status;

-    if (!queued_notification_count && (status = poll_netlink())) return status;
+    if (!queued_notification_count && (status = poll_events())) return status;
     assert( queued_notification_count );
     params->module = *queued_notifications[0].module;
     params->table = queued_notifications[0].table;

[PATCH 0/2] MR8048: nsiproxy: Implement change notifications for NSI_IP_UNICAST_TABLE on macOS. - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.