Changeset 100128 in vbox for trunk

Timestamp:

Jun 8, 2023 4:45:25 PM (19 months ago)

Author:

vboxsync

Message:

Devices/Network: wip. debug implementation of libslirp driver. bugref:10268

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (3 diffs)
• build/VBoxDD.cpp (modified) (1 diff)
• build/VBoxDD.h (modified) (1 diff)

trunk/src/VBox/Devices/Makefile.kmk

@@ -773 +773 @@
  ifdef VBOX_WITH_LIBSLIRP
   VBoxDD_LIBS   += $(PATH_STAGE_LIB)/VBox-libslirp$(VBOX_SUFF_LIB)
+  VBoxDD_LIBS.darwin += resolv
   VBoxDD_DEFS   += VBOX_WITH_LIBSLIRP
   VBoxDD_SOURCES += \
@@ -782 +783 @@
 
  # --- WARNING! SLIRP MESS AHEAD! ;-) ---
+ ifndef VBOX_WITH_LIBSLIRP
  VBOX_SLIRP_SOURCES = \
         Network/DrvNAT.cpp \
@@ -886 +888 @@
  $(foreach file,$(VBOX_SLIRP_BSD_SOURCES),$(eval $(call def_vbox_slirp_cflags, Network)))
  $(foreach file,$(VBOX_SLIRP_BSD_SOURCES),$(eval $(call def_vbox_slirp_bsd_cflags, Network)))
+ endif
 
 

trunk/src/VBox/Devices/build/VBoxDD.cpp

@@ -314 +314 @@
         return rc;
 #endif
+#ifdef VBOX_WITH_LIBSLIRP
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvNATlibslirp);
+    if (RT_FAILURE(rc))
+        return rc;
+#endif
 #if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostInterface);

trunk/src/VBox/Devices/build/VBoxDD.h

@@ -137 +137 @@
 extern const PDMDRVREG g_DrvIntNet;
 extern const PDMDRVREG g_DrvDedicatedNic;
+#ifndef VBOX_WITH_LIBSLIRP
 extern const PDMDRVREG g_DrvNAT;
+#endif
+#ifdef VBOX_WITH_LIBSLIRP
+extern const PDMDRVREG g_DrvNATlibslirp;
+#endif
 #ifdef VBOX_WITH_NETSHAPER
 extern const PDMDRVREG g_DrvNetShaper;