Changeset 85341 in vbox for trunk/src/VBox/Runtime/r0drv

Timestamp:

Jul 14, 2020 1:45:21 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

139321

Message:

IPRt/dbgkrnlinfo-r0drv-darwin.cpp: Don't use deprecated network KPIs (>=10.15) as standard candles. bugref:9790

File:

• trunk/src/VBox/Runtime/r0drv/darwin/dbgkrnlinfo-r0drv-darwin.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/r0drv/darwin/dbgkrnlinfo-r0drv-darwin.cpp

@@ -33 +33 @@
 # include <sys/kauth.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_socket.h>
+# if MAC_OS_X_VERSION_MIN_REQUIRED < 101500
+#  include <sys/kpi_mbuf.h>
+#  include <net/kpi_interfacefilter.h>
+#  include <sys/kpi_socket.h>
+# endif
 # include <sys/kpi_socketfilter.h>
 RT_C_DECLS_END
@@ -370 +372 @@
         KNOWN_ENTRY(copystr),
         KNOWN_ENTRY(current_proc),
-        KNOWN_ENTRY(ifnet_hdrlen),
-        KNOWN_ENTRY(ifnet_set_promiscuous),
         KNOWN_ENTRY(kauth_getuid),
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
@@ -378 +378 @@
         KNOWN_ENTRY(kauth_cred_rele),
 #endif
-        KNOWN_ENTRY(mbuf_data),
         KNOWN_ENTRY(msleep),
         KNOWN_ENTRY(nanotime),
@@ -384 +383 @@
         KNOWN_ENTRY(proc_pid),
 #if MAC_OS_X_VERSION_MIN_REQUIRED < 101500
+        KNOWN_ENTRY(mbuf_data),
+        KNOWN_ENTRY(ifnet_hdrlen),
+        KNOWN_ENTRY(ifnet_set_promiscuous),
         KNOWN_ENTRY(sock_accept),
         KNOWN_ENTRY(sockopt_name),