Changeset 12691 in vbox for trunk/src

Timestamp:

Sep 24, 2008 2:42:09 PM (16 years ago)

Author:

vboxsync

Message:

Solaris/vboxnetflt: Resolve R0 RT bits from vboxdrv which drags in extra RT symbols needed by NetFlt.

Location:

trunk/src/VBox/HostDrivers

Files:

• Support/Makefile.kmk (modified) (1 diff)
• Support/solaris/SUPDrv-solaris.c (modified) (2 diffs)
• VBoxNetFlt/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/Makefile.kmk

@@ -392 +392 @@
 vboxdrv_DEFS         += VBOX_WITH_IDT_PATCHING
 endif
+ifdef VBOX_WITH_NETFLT
+vboxdrv_DEFS         += VBOX_WITH_NETFLT
+endif
 vboxdrv_INCS         := $(PATH_SUB_CURRENT)
 vboxdrv_LIBS          = $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)

trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c

@@ -60 +60 @@
 #include <iprt/string.h>
 
+/**
+ * Drag in symbols from R0 Runtime required by VBoxNetFlt.
+ */
+#ifdef VBOX_WITH_NETFLT
+# include <iprt/crc32.h>
+# include <iprt/uuid.h>
+# include <iprt/net.h>
+
+static RTR0PTR g_vboxNetFltSolarisRTR0Symbols[] =
+{
+    (void *)RTCrc32,
+    (void *)RTUuidFromStr,
+    (void *)RTUuidCompareStr,
+    (void *)RTNetIPv4UDPChecksum,
+    (void *)RTNetIPv4TCPChecksum,
+    (void *)RTNetIPv4IsHdrValid
+};
+#endif  /* VBOX_WITH_NETFLT */
 
 /*******************************************************************************
@@ -191 +209 @@
 {
     LogFlow((DEVICE_NAME ":_init\n"));
+
+#ifdef VBOX_WITH_NETFLT
+    NOREF(g_vboxNetFltSolarisRTR0Symbols);
+#endif
 
     /*

trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk

@@ -122 +122 @@
 vboxnetflt_LIBS = \
         $(PATH_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
-if1of ($(KBUILD_TARGET),solaris) ## @todo vboxflt should resolve all the IPRT bits from vboxdrv.
-vboxnetflt_LIBS += \
-        $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
-endif
+## vboxflt resolves all the IPRT bits from vboxdrv.
 vboxnetflt_SOURCES.linux = linux/VBoxNetFlt-linux.c
 vboxnetflt_SOURCES.solaris = solaris/VBoxNetFlt-solaris.c