Changeset 47897 in vbox

Timestamp:

Aug 20, 2013 11:55:24 AM (12 years ago)

Author:

vboxsync

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

88200

Message:

NetworkServices/NAT: renamed old VBoxNetNAT to VBoxNetSlirpNAT

Location:

trunk/src/VBox/NetworkServices/NAT

Files:

• Makefile.kmk (modified) (3 diffs)
• VBoxNetSlirpNAT.cpp (moved) (moved from trunk/src/VBox/NetworkServices/NAT/VBoxNetNAT.cpp )

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

@@ -20 +20 @@
 # Disable Slirp based service.
 #ifdef VBOX_WITH_HARDENING
-# PROGRAMS += VBoxNetNATHardened
-# DLLS += VBoxNetNAT
+# PROGRAMS += VBoxNetSlirpNATHardened
+# DLLS += VBoxNetSlirpNAT
 #else
-# PROGRAMS += VBoxNetNAT
+# PROGRAMS += VBoxNetSlirpNAT
 #endif
-VBoxNetNAT_TEMPLATE =
-VBoxNetNAT_TEMPLATE := VBOXR3$(if-expr defined(VBOX_WITH_HARDENING),,EXE)
-VBoxNetNAT_INCS = ../../Devices/Network/slirp
-VBoxNetNAT_DEFS = VBOX_WITH_NAT_SERVICE
-VBoxNetNAT_SOURCES += VBoxNetNAT.cpp
-VBoxNetNAT_DEFS += VBOX_WITH_NAT_SERVICE
+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
@@ -45 +45 @@
 
 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,VBoxNetNAT,../../Devices,$(file))))
-$(foreach file,$(VBOX_SLIRP_ALIAS_SOURCES),$(eval $(call def_vbox_nat_network_service_sources, VBoxNetNAT,../../Devices,$(file))))
-$(foreach file,$(VBOX_SLIRP_BSD_SOURCES),$(eval $(call def_vbox_nat_network_service_sources, VBoxNetNAT,../../Devices,$(file))))
+$(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)))
@@ -59 +59 @@
 $(foreach file,$(addprefix ../../Devices/, $(VBOX_SLIRP_ALIAS_SOURCES)),$(eval $(call def_vbox_slirp_alias_cflags, ../../Devices/Network)))
 
-VBoxNetNAT_SOURCES += ../NetLib/VBoxNetBaseService.cpp
+VBoxNetSlirpNAT_SOURCES += ../NetLib/VBoxNetBaseService.cpp
 
-VBoxNetNAT_LIBS = \
+VBoxNetSlirpNAT_LIBS = \
         $(LIB_RUNTIME)
-VBoxNetNAT_LDFLAGS.win = /SUBSYSTEM:windows
+VBoxNetSlirpNAT_LDFLAGS.win = /SUBSYSTEM:windows
 
 ifdef VBOX_WITH_LWIP_NAT