Changeset 47992 in vbox for trunk/src/VBox

Timestamp:

Aug 22, 2013 2:38:19 PM (11 years ago)

Author:

vboxsync

Message:

Drop VBoxNetSlirpNAT.cpp - it's not and will not be used. It begat
lwip version and can retire in peace now. Slirp sources need
addtional cleanup to g/c service-specific bits, but that will be
handled separately.

Location:

trunk/src/VBox/NetworkServices/NAT

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxNetSlirpNAT.cpp (deleted)

trunk/src/VBox/NetworkServices/NAT/Makefile.kmk

@@ -17 +17 @@
 SUB_DEPTH = ../../../..
 include $(KBUILD_PATH)/subheader.kmk
-#
-# Disable Slirp based service.
-#ifdef VBOX_WITH_HARDENING
-# PROGRAMS += VBoxNetSlirpNATHardened
-# DLLS += VBoxNetSlirpNAT
-#else
-# PROGRAMS += VBoxNetSlirpNAT
-#endif
-VBoxNetSlirpNAT_TEMPLATE =
-VBoxNetSlirpNAT_TEMPLATE := VBOXR3$(if-expr defined(VBOX_WITH_HARDENING),,EXE)
-VBoxNetSlirpNAT_INCS = ../../Devices/Network/slirp
-VBoxNetSlirpNAT_DEFS = VBOX_WITH_NAT_SERVICE
-VBoxNetSlirpNAT_SOURCES += VBoxNetSlirpNAT.cpp
-VBoxNetSlirpNAT_DEFS += VBOX_WITH_NAT_SERVICE
-
-#define def_vbox_slirp_service_cflags
-#  $(file)_DEFS += VBOX_WITH_NAT_SERVICE
-#endef
 
 define def_vbox_nat_network_service_sources
@@ -43 +25 @@
     $(1)_INCS += $2/$3
 endef
-
-VBOX_NOT_IN_NATSERVICE = Network/DrvNAT.cpp
-$(foreach file,$(filter-out $(VBOX_NOT_IN_NATSERVICE), $(VBOX_SLIRP_SOURCES)),$(eval $(call def_vbox_nat_network_service_sources,VBoxNetSlirpNAT,../../Devices,$(file))))
-$(foreach file,$(VBOX_SLIRP_ALIAS_SOURCES),$(eval $(call def_vbox_nat_network_service_sources, VBoxSlirpNetNAT,../../Devices,$(file))))
-$(foreach file,$(VBOX_SLIRP_BSD_SOURCES),$(eval $(call def_vbox_nat_network_service_sources, VBoxNetSlirpNAT,../../Devices,$(file))))
-
-$(foreach file,$(addprefix ../../Devices/, $(VBOX_SLIRP_BSD_SOURCES)),$(eval $(call def_vbox_slirp_cflags,../../Devices/Network)))
-$(foreach file,$(addprefix ../../Devices/, $(VBOX_SLIRP_BSD_SOURCES)),$(eval $(call def_vbox_slirp_bsd_cflags,../../Devices/Network)))
-$(foreach file,$(addprefix ../../Devices/, $(filter-out $(VBOX_WITH_NAT_SERVICE), $(VBOX_SLIRP_SOURCES))),$(eval $(call def_vbox_slirp_service_cflags, ../../Devices/Network)))
-$(foreach file,$(addprefix ../../Devices/, $(filter-out $(VBOX_WITH_NAT_SERVICE), $(VBOX_SLIRP_SOURCES))),$(eval $(call def_vbox_slirp_cflags,../../Devices/Network)))
-
-$(foreach file,$(addprefix ../../Devices/, $(VBOX_SLIRP_ALIAS_SOURCES)),$(eval $(call def_vbox_slirp_cflags, ../../Devices/Network)))
-
-
-$(foreach file,$(addprefix ../../Devices/, $(VBOX_SLIRP_ALIAS_SOURCES)),$(eval $(call def_vbox_slirp_alias_cflags, ../../Devices/Network)))
-
-VBoxNetSlirpNAT_SOURCES += ../NetLib/VBoxNetBaseService.cpp
-
-VBoxNetSlirpNAT_LIBS = \
-        $(LIB_RUNTIME)
-VBoxNetSlirpNAT_LDFLAGS.win = /SUBSYSTEM:windows
 
 ifdef VBOX_WITH_LWIP_NAT