Changeset 19317 in vbox for trunk

Timestamp:

May 4, 2009 3:38:31 AM (16 years ago)

Author:

vboxsync

Message:

DRV: DrvNAT is switch off-able

Location:

trunk/src/VBox/Devices

Files:

• Builtins.cpp (modified) (1 diff)
• Builtins.h (modified) (1 diff)
• Makefile.kmk (modified) (6 diffs)

trunk/src/VBox/Devices/Builtins.cpp

@@ -223 +223 @@
     if (RT_FAILURE(rc))
         return rc;
-#ifndef RT_OS_L4
+#if !defined(RT_OS_L4) 
+# if !defined(VBOX_WITH_NAT_SERVICE) 
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvNAT);
     if (RT_FAILURE(rc))
         return rc;
+# endif
 #endif
 #if defined(RT_OS_LINUX)

trunk/src/VBox/Devices/Builtins.h

@@ -105 +105 @@
 #endif
 extern const PDMDRVREG g_DrvIntNet;
+#ifndef VBOX_WITH_NAT_SERVICE
 extern const PDMDRVREG g_DrvNAT;
+#endif
 extern const PDMDRVREG g_DrvNetSniffer;
 extern const PDMDRVREG g_DrvAUDIO;

trunk/src/VBox/Devices/Makefile.kmk

@@ -136 +136 @@
 endif
 ifdef VBOX_WITH_ISCSI
- VBoxDD_DEFS           += VBOX_WITH_ISCSI
+ VBoxDD_DEFS           +=  VBOX_WITH_ISCSI
  ifdef VBOX_WITH_INIP
   VBoxDD_DEFS          += VBOX_WITH_INIP
@@ -626 +626 @@
 Drivers_DEFS      += VBOX_WITH_FAULT_INJECTION
 endif
+
 Drivers_INCS      := \
-        $(PATH_SUB_CURRENT) \
-        Network/slirp
+        $(PATH_SUB_CURRENT)
 Drivers_SOURCES    = \
         Audio/audio.c \
@@ -651 +651 @@
         Network/Pcap.cpp
 
+Drivers_INCS += Network/slirp
+
+ifndef VBOX_WITH_NAT_SERVICE
 VBOX_SLIRP_SOURCES = \
         Network/DrvNAT.cpp \
@@ -674 +677 @@
 VBOX_WITH_SLIRP_DNS_PROXY=1
 
-ifdef VBOX_WITH_SLIRP_DNS_PROXY
+ ifdef VBOX_WITH_SLIRP_DNS_PROXY
 VBOX_SLIRP_SOURCES += \
         Network/slirp/dnsproxy/hash.c \
         Network/slirp/dnsproxy/dnsproxy.c
-endif
+ endif
 
 # some day will be deleted
@@ -684 +687 @@
 
 Drivers_SOURCES += $(VBOX_SLIRP_SOURCES)
-define def_vbox_slirp_cflags
-  $(file)_DEFS += \
+ define def_vbox_slirp_cflags
+   $(file)_DEFS += \
       $(if $(VBOX_WITH_SLIRP_MEMORY_CHECK),RTMEM_WRAP_TO_EF_APIS,) \
       $(if $(VBOX_WITH_DEBUG_NAT_SOCKETS),VBOX_WITH_DEBUG_NAT_SOCKETS,) \
@@ -691 +694 @@
       $(if $(VBOX_WITH_SLIRP_DNS_PROXY),VBOX_WITH_SLIRP_DNS_PROXY,)     \
       $(if $(VBOX_WITH_SLIRP_MT),VBOX_WITH_SLIRP_MT,)
- ifeq ($(KBUILD_TARGET),win)
-  $(file)_CFLAGS = -wd4018
- else
-  $(file)_CFLAGS = -Wno-sign-compare
- endif
-endef
+  ifeq ($(KBUILD_TARGET),win)
+   $(file)_CFLAGS = -wd4018
+  else
+   $(file)_CFLAGS = -Wno-sign-compare
+  endif
+ endef
 $(foreach file,$(VBOX_SLIRP_SOURCES),$(eval $(def_vbox_slirp_cflags)))
+else
+Drivers_DEFS += VBOX_WITH_NAT_SERVICE
+VBoxDD_DEFS  += VBOX_WITH_NAT_SERVICE
+endif
 
 # -- OS specific --