Changeset 85344 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Jul 14, 2020 6:46:00 PM (5 years ago)

Author:

vboxsync

Message:

VBoxNetFlt/darwin: Some adjustments for making it build against a 10.15 SDK. bugref:9790

Location:

trunk/src/VBox/HostDrivers

Files:

• VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp (modified) (10 diffs)
• darwin/VBoxNetSend.h (modified) (1 diff)

trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp

@@ -59 +59 @@
 #include <sys/sockio.h>
 #include <sys/kern_event.h>
-#include <net/kpi_interface.h>
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101500 /* The 10.15 SDK has a slightly butchered API deprecation attempt. */
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wmacro-redefined"      /* Each header redefines __NKE_API_DEPRECATED. */
+# pragma clang diagnostic ignored "-Wmissing-declarations" /* Misplaced __NKE_API_DEPRECATED; in kpi_mbuf.h. */
+# include <sys/kpi_socket.h>
+# include <net/kpi_interface.h>
+# include <sys/kpi_mbuf.h>
+# include <net/kpi_interfacefilter.h>
+# pragma clang diagnostic pop
+#else /* < 10.15*/
+# include <sys/kpi_socket.h>
+# include <net/kpi_interface.h>
 RT_C_DECLS_BEGIN /* Buggy 10.4 headers, fixed in 10.5. */
-#include <sys/kpi_mbuf.h>
-#include <net/kpi_interfacefilter.h>
+# include <sys/kpi_mbuf.h>
+# include <net/kpi_interfacefilter.h>
 RT_C_DECLS_END
-
-#include <sys/kpi_socket.h>
+#endif /* < 10.15*/
+
+
 #include <net/if.h>
 #include <net/if_var.h>
@@ -1375 +1387 @@
     if (pThis->u.s.pSysSock != NULL)
     {
+        RT_GCC_NO_WARN_DEPRECATED_BEGIN
+
         sock_close(pThis->u.s.pSysSock);
         pThis->u.s.pSysSock = NULL;
+
+        RT_GCC_NO_WARN_DEPRECATED_END
     }
 
@@ -1406 +1422 @@
     errno_t error;
 
+    /** @todo Figure out how to replace the socket stuff we use to detect
+     *        addresses here as 10.5 deprecates it. */
+    RT_GCC_NO_WARN_DEPRECATED_BEGIN
+
     /** @todo reorg code to not have numerous returns with duplicate code... */
+    /** @todo reorg code to not have numerous returns with duplicate code... */
+    /** @todo reorg code to not have numerous returns with duplicate code... */
+    /** @todo reorg code to not have numerous returns with duplicate code... */
+    /** @todo reorg code to not have numerous returns with duplicate code... */
+    /** @todo reorg code to not have numerous returns with duplicate code... */
+    /** @todo reorg code to not have numerous returns with duplicate code... */
+    /** @todo reorg code to not have numerous returns with duplicate code... */
+    /** @todo reorg code to not have numerous returns with duplicate code... */
+
     error = sock_socket(PF_SYSTEM, SOCK_RAW, SYSPROTO_EVENT,
                         vboxNetFltDarwinSysSockUpcall, pThis,
@@ -1448 +1477 @@
         return rc;
     }
+    RT_GCC_NO_WARN_DEPRECATED_END
 
     ifnet_t pIfNet = pThis->u.s.pIfNet; /* already retained */
@@ -1527 +1557 @@
     if (RT_UNLIKELY(pSysSock != pThis->u.s.pSysSock))
     {
-        Log(("vboxNetFltDarwinSysSockUpcall: %p != %p?\n",
-             pSysSock, pThis->u.s.pSysSock));
+        Log(("vboxNetFltDarwinSysSockUpcall: %p != %p?\n", pSysSock, pThis->u.s.pSysSock));
         return;
     }
@@ -1541 +1570 @@
         size_t len = sizeof(struct kern_event_msg) - sizeof(u_int32_t) + sizeof(struct kev_in6_data);
 
+        RT_GCC_NO_WARN_DEPRECATED_BEGIN
         error = sock_receivembuf(pSysSock, NULL, &m, 0, &len);
+        RT_GCC_NO_WARN_DEPRECATED_END
         if (error != 0)
         {
@@ -1566 +1597 @@
             if (len - (sizeof(struct kern_event_msg) - sizeof(u_int32_t)) < sizeof(struct kev_in_data))
             {
-                Log(("vboxNetFltDarwinSysSockUpcall: %u bytes is too short for KEV_INET_SUBCLASS\n",
-                     (unsigned int)len));
+                Log(("vboxNetFltDarwinSysSockUpcall: %u bytes is too short for KEV_INET_SUBCLASS\n", (unsigned int)len));
                 mbuf_freem(m);
                 return;
@@ -1613 +1643 @@
             {
                 Log(("vboxNetFltDarwinSysSockUpcall: %u bytes is too short for KEV_INET6_SUBCLASS\n",
-                        (unsigned int)len));
+                     (unsigned int)len));
                 mbuf_freem(m);
                 return;
@@ -1653 +1683 @@
 
                 kev_inet6_new:
-                    pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort,
-                        /* :fAdded */ true, kIntNetAddrType_IPv6, pAddr);
+                    pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort, true /*fAdded*/, kIntNetAddrType_IPv6, pAddr);
                     break;
 
@@ -1661 +1690 @@
                          IFNAMSIZ, link->if_name, link->if_unit, pAddr));
 
-                    pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort,
-                        /* :fAdded */ false, kIntNetAddrType_IPv6, pAddr);
+                    pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort, false /*fAdded*/, kIntNetAddrType_IPv6, pAddr);
                     break;
 

trunk/src/VBox/HostDrivers/darwin/VBoxNetSend.h

@@ -40 +40 @@
 
 # include <sys/socket.h>
-# include <net/kpi_interface.h>
+# if MAC_OS_X_VERSION_MIN_REQUIRED >= 101500 /* The 10.15 SDK has a slightly butchered API deprecation attempt. */
+#  pragma clang diagnostic push
+#  pragma clang diagnostic ignored "-Wmacro-redefined"      /* Each header redefines __NKE_API_DEPRECATED. */
+#  pragma clang diagnostic ignored "-Wmissing-declarations" /* Misplaced __NKE_API_DEPRECATED; in kpi_mbuf.h. */
+#  include <net/kpi_interface.h>
+#  include <sys/kpi_mbuf.h>
+#  include <net/if.h>
+#  pragma clang diagnostic pop
+# else /* < 10.15 */
+#  include <net/kpi_interface.h>
 RT_C_DECLS_BEGIN /* Buggy 10.4 headers, fixed in 10.5. */
-# include <sys/kpi_mbuf.h>
+#  include <sys/kpi_mbuf.h>
 RT_C_DECLS_END
-# include <net/if.h>
+#  include <net/if.h>
+# endif /* < 10.15 */
+
 
 RT_C_DECLS_BEGIN