Changeset 98417 in vbox for trunk/src/VBox

Timestamp:

Feb 1, 2023 4:25:48 PM (23 months ago)

Author:

vboxsync

Message:

NetworkServices/*.kmk: Automatic scm cleanups. bugref:10348

Location:

trunk/src/VBox/NetworkServices

Files:

• Dhcpd/Makefile.kmk (modified) (3 diffs)
• IntNetSwitch/Makefile.kmk (modified) (2 diffs)
• Makefile.kmk (modified) (1 diff)
• NAT/Makefile.kmk (modified) (1 diff)

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

@@ -37 +37 @@
 #
 ifdef VBOX_WITH_HARDENING
-PROGRAMS += VBoxNetDHCPHardened
-VBoxNetDHCPHardened_TEMPLATE = VBoxR3HardenedExe
-VBoxNetDHCPHardened_NAME     = VBoxNetDHCP
-VBoxNetDHCPHardened_SOURCES  = VBoxNetDhcpdHardened.cpp
-VBoxNetDHCPHardened_LDFLAGS.win = /SUBSYSTEM:windows
-$(call VBOX_SET_VER_INFO_DLL,VBoxNetDHCPHardened,VirtualBox DHCP Server,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
+ PROGRAMS += VBoxNetDHCPHardened
+ VBoxNetDHCPHardened_TEMPLATE = VBoxR3HardenedExe
+ VBoxNetDHCPHardened_NAME    = VBoxNetDHCP
+ VBoxNetDHCPHardened_SOURCES = VBoxNetDhcpdHardened.cpp
+ VBoxNetDHCPHardened_LDFLAGS.win = /SUBSYSTEM:windows
+ $(call VBOX_SET_VER_INFO_DLL,VBoxNetDHCPHardened,VirtualBox DHCP Server,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
 endif
 
@@ -50 +50 @@
 #
 ifdef VBOX_WITH_HARDENING
-DLLS     += VBoxNetDHCP
-VBoxNetDHCP_TEMPLATE := VBoxR3Dll
+ DLLS    += VBoxNetDHCP
+ VBoxNetDHCP_TEMPLATE := VBoxR3Dll
 else
-PROGRAMS += VBoxNetDHCP
-VBoxNetDHCP_TEMPLATE := VBoxR3Exe
+ PROGRAMS += VBoxNetDHCP
+ VBoxNetDHCP_TEMPLATE := VBoxR3Exe
 endif
 
@@ -61 +61 @@
 
 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
-VBoxNetDHCP_DEFS      = KBUILD_TYPE="$(KBUILD_TYPE)"
+ VBoxNetDHCP_DEFS     = KBUILD_TYPE="$(KBUILD_TYPE)"
 else
-VBoxNetDHCP_DEFS      = KBUILD_TYPE=\"$(KBUILD_TYPE)\"
+ VBoxNetDHCP_DEFS     = KBUILD_TYPE=\"$(KBUILD_TYPE)\"
 endif
 VBoxNetDHCP_DEFS       += \
-        $(if $(VBOX_WITH_INTNET_SERVICE_IN_R3),VBOX_WITH_INTNET_SERVICE_IN_R3,)
+        $(if $(VBOX_WITH_INTNET_SERVICE_IN_R3),VBOX_WITH_INTNET_SERVICE_IN_R3,)
 
 #VBoxNetDHCP_DEFS     += IPv6
 #VBoxNetDHCP_DEFS.linux = WITH_VALGRIND
 ifneq ($(KBUILD_TARGET),win)
-VBoxNetDHCP_DEFS     += VBOX_WITH_XPCOM
-VBoxNetDHCP_INCS     += $(VBOX_XPCOM_INCS)
+ VBoxNetDHCP_DEFS    += VBOX_WITH_XPCOM
+ VBoxNetDHCP_INCS    += $(VBOX_XPCOM_INCS)
  ifneq ($(KBUILD_TARGET),darwin)
   # We want -std=c++11 for 4.7 and newer compilers, and -std=c++0x for older ones.
-VBoxNetDHCP_CXXFLAGS += -std=$(if $(VBOX_GCC_VERSION_CXX),$(if $(VBOX_GCC_VERSION_CXX) < 40700,c++0x,c++11),c++0x)
+  VBoxNetDHCP_CXXFLAGS += -std=$(if $(VBOX_GCC_VERSION_CXX),$(if $(VBOX_GCC_VERSION_CXX) < 40700,c++0x,c++11),c++0x)
  endif
 endif

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

@@ -36 +36 @@
 
 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
-VBoxIntNetSwitch_DEFS      = KBUILD_TYPE="$(KBUILD_TYPE)"
+ VBoxIntNetSwitch_DEFS     = KBUILD_TYPE="$(KBUILD_TYPE)"
 else
-VBoxIntNetSwitch_DEFS      = KBUILD_TYPE=\"$(KBUILD_TYPE)\"
+ VBoxIntNetSwitch_DEFS     = KBUILD_TYPE=\"$(KBUILD_TYPE)\"
 endif
 VBoxIntNetSwitch_DEFS     += VBOX_WITH_INTNET_SERVICE_IN_R3
@@ -50 +50 @@
 
 ifeq ($(KBUILD_TARGET),darwin)
-INSTALLS += VBoxIntNetSwitch.xpc
+ INSTALLS += VBoxIntNetSwitch.xpc
 
-VBoxIntNetSwitch.xpc_MODE = 644
-VBoxIntNetSwitch.xpc_INST = $(INST_VIRTUALBOX)Contents/XPCServices/org.virtualbox.intnet.xpc/Contents/
-VBoxIntNetSwitch.xpc_SOURCES = \
-        $(VBoxIntNetSwitch.xpc_0_OUTDIR)/Info.plist
+ VBoxIntNetSwitch.xpc_MODE = 644
+ VBoxIntNetSwitch.xpc_INST = $(INST_VIRTUALBOX)Contents/XPCServices/org.virtualbox.intnet.xpc/Contents/
+ VBoxIntNetSwitch.xpc_SOURCES = \
+        $(VBoxIntNetSwitch.xpc_0_OUTDIR)/Info.plist
 
  $$(VBoxIntNetSwitch.xpc_0_OUTDIR)/Info.plist: $(PATH_SUB_CURRENT)/darwin/Info.plist $(VBOX_VERSION_MK) | $$(@D)/

trunk/src/VBox/NetworkServices/Makefile.kmk

@@ -33 +33 @@
 
 # VBoxNetNAT requires COM/XPCOM.
-if defined(VBOX_WITH_NAT_SERVICE) && defined(VBOX_WITH_MAIN) \
+if   defined(VBOX_WITH_NAT_SERVICE) && defined(VBOX_WITH_MAIN) \
   && "$(intersects $(KBUILD_TARGET_ARCH),$(VBOX_SUPPORTED_HOST_ARCHS))" != ""
  include $(PATH_SUB_CURRENT)/NAT/Makefile.kmk

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

@@ -34 +34 @@
  endif
 
-#
-# Globals
-#
-VBOX_PATH_NAT_SRC := $(PATH_SUB_CURRENT)
+ #
+ # Globals
+ #
+ VBOX_PATH_NAT_SRC := $(PATH_SUB_CURRENT)
 
 
-#
-# Hardened stub exe for VBoxNetNAT.
-#
+ #
+ # Hardened stub exe for VBoxNetNAT.
+ #
  ifdef VBOX_WITH_HARDENING
-PROGRAMS += VBoxNetNATHardened
-VBoxNetNATHardened_TEMPLATE = VBoxR3HardenedExe
-VBoxNetNATHardened_NAME     = VBoxNetNAT
+  PROGRAMS += VBoxNetNATHardened
+  VBoxNetNATHardened_TEMPLATE = VBoxR3HardenedExe
+  VBoxNetNATHardened_NAME   = VBoxNetNAT
   ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
-VBoxNetNATHardened_DEFS     = SERVICE_NAME="VBoxNetNAT"
+   VBoxNetNATHardened_DEFS  = SERVICE_NAME="VBoxNetNAT"
   else
-VBoxNetNATHardened_DEFS     = SERVICE_NAME=\"VBoxNetNAT\"
+   VBoxNetNATHardened_DEFS  = SERVICE_NAME=\"VBoxNetNAT\"
   endif
-VBoxNetNATHardened_SOURCES  = VBoxNetNATHardened.cpp
-VBoxNetNATHardened_LDFLAGS.win = /SUBSYSTEM:windows
-$(call VBOX_SET_VER_INFO_EXE,VBoxNetNATHardened,VirtualBox NAT Engine,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
+  VBoxNetNATHardened_SOURCES = VBoxNetNATHardened.cpp
+  VBoxNetNATHardened_LDFLAGS.win = /SUBSYSTEM:windows
+  $(call VBOX_SET_VER_INFO_EXE,VBoxNetNATHardened,VirtualBox NAT Engine,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
  endif
 
 
-#
-# VBoxNetNAT.
-#
+ #
+ # VBoxNetNAT.
+ #
  ifdef VBOX_WITH_HARDENING
-DLLS     += VBoxNetNAT
+  DLLS   += VBoxNetNAT
  else
-PROGRAMS += VBoxNetNAT
+  PROGRAMS += VBoxNetNAT
  endif
-VBoxNetNAT_TEMPLATE := $(if-expr defined(VBOX_WITH_HARDENING),VBoxMainDll,VBoxMainClientExe)
-VBoxNetNAT_NAME     := VBoxNetNAT
-VBoxNetNAT_DEFS      = \
+ VBoxNetNAT_TEMPLATE := $(if-expr defined(VBOX_WITH_HARDENING),VBoxMainDll,VBoxMainClientExe)
+ VBoxNetNAT_NAME    := VBoxNetNAT
+ VBoxNetNAT_DEFS     = \
         IPv6 \
         $(if $(VBOX_WITH_INTNET_SERVICE_IN_R3),VBOX_WITH_INTNET_SERVICE_IN_R3,)
-# VBoxNetNAT_DEFS.linux = WITH_VALGRIND # instrument lwip memp.c
-VBoxNetNAT_DEFS.win  = VBOX_COM_OUTOFPROC_MODULE _WIN32_WINNT=0x501 # Windows XP
-# Convince Solaris headers to expose socket stuff we need.
-#
-# Setting _XOPEN_SOURCE to either 500 or 600 would always work, but
-# <sys/feature_tests.h> insists that 600 requires C99 and so it
-# explodes for older g++.  It also insists that 500 is NOT to be used
-# with C99.
-#
-# Newer g++ in C++11 mode (formerly known as C++0x) needs 600, so it
-# employs sleight of hand to pretend it's C99 to keep feature test
-# happy.
-#
-# Compile the C code with settings that match g++.  This probably
-# should be centralized so that whole codebase uses consistent
-# settings.
+ # VBoxNetNAT_DEFS.linux = WITH_VALGRIND # instrument lwip memp.c
+ VBoxNetNAT_DEFS.win = VBOX_COM_OUTOFPROC_MODULE _WIN32_WINNT=0x501 # Windows XP
+ # Convince Solaris headers to expose socket stuff we need.
+ #
+ # Setting _XOPEN_SOURCE to either 500 or 600 would always work, but
+ # <sys/feature_tests.h> insists that 600 requires C99 and so it
+ # explodes for older g++.  It also insists that 500 is NOT to be used
+ # with C99.
+ #
+ # Newer g++ in C++11 mode (formerly known as C++0x) needs 600, so it
+ # employs sleight of hand to pretend it's C99 to keep feature test
+ # happy.
+ #
+ # Compile the C code with settings that match g++.  This probably
+ # should be centralized so that whole codebase uses consistent
+ # settings.
  ifeq ($(KBUILD_TARGET),solaris)
   ifneq ($(VBOX_GCC_VERSION_CXX),)
    if $(VBOX_GCC_VERSION_CXX) >= 40600
-# we compile C++ code with -std=c++0x / -std=c++11
-VBoxNetNAT_CFLAGS.solaris += -std=c99
-VBoxNetNAT_DEFS.solaris += _XOPEN_SOURCE=600
+    # we compile C++ code with -std=c++0x / -std=c++11
+    VBoxNetNAT_CFLAGS.solaris += -std=c99
+    VBoxNetNAT_DEFS.solaris += _XOPEN_SOURCE=600
    else
-VBoxNetNAT_DEFS.solaris += _XOPEN_SOURCE=500
+    VBoxNetNAT_DEFS.solaris += _XOPEN_SOURCE=500
    endif
   endif
-VBoxNetNAT_DEFS.solaris += __EXTENSIONS__=1
+  VBoxNetNAT_DEFS.solaris += __EXTENSIONS__=1
  endif
 
-# (current dir is for for lwipopts.h)
-VBoxNetNAT_INCS += . $(addprefix ../../Devices/Network/lwip-new/,$(LWIP_INCS))
+ # (current dir is for for lwipopts.h)
+ VBoxNetNAT_INCS += . $(addprefix ../../Devices/Network/lwip-new/,$(LWIP_INCS))
 
-VBoxNetNAT_SOURCES = \
-        VBoxNetLwipNAT.cpp \
-        ../NetLib/IntNetIf.cpp \
-        ../NetLib/VBoxNetPortForwardString.cpp \
-        $(addprefix ../../Devices/Network/lwip-new/,$(LWIP_SOURCES)) \
-        proxy_pollmgr.c \
-        proxy_rtadvd.c \
-        proxy.c \
-        pxremap.c \
-        pxtcp.c \
-        pxudp.c \
-        pxdns.c \
-        fwtcp.c \
-        fwudp.c \
-        portfwd.c \
-        proxy_dhcp6ds.c \
-        proxy_tftpd.c
+ VBoxNetNAT_SOURCES = \
+        VBoxNetLwipNAT.cpp \
+        ../NetLib/IntNetIf.cpp \
+        ../NetLib/VBoxNetPortForwardString.cpp \
+        $(addprefix ../../Devices/Network/lwip-new/,$(LWIP_SOURCES)) \
+        proxy_pollmgr.c \
+        proxy_rtadvd.c \
+        proxy.c \
+        pxremap.c \
+        pxtcp.c \
+        pxudp.c \
+        pxdns.c \
+        fwtcp.c \
+        fwudp.c \
+        portfwd.c \
+        proxy_dhcp6ds.c \
+        proxy_tftpd.c
 
  ifeq ($(KBUILD_TARGET),win)
-VBoxNetNAT_SOURCES += pxping_win.c # unprivileged Icmp API
+  VBoxNetNAT_SOURCES += pxping_win.c # unprivileged Icmp API
  else
-VBoxNetNAT_SOURCES        += pxping.c     # raw sockets
-VBoxNetNAT_CFLAGS.linux   += -Wno-address-of-packed-member # Needed for GCC 9.
+  VBoxNetNAT_SOURCES      += pxping.c     # raw sockets
+  VBoxNetNAT_CFLAGS.linux += -Wno-address-of-packed-member # Needed for GCC 9.
  endif
 
-VBoxNetNAT_SOURCES.darwin  += rtmon_bsd.c
-VBoxNetNAT_SOURCES.freebsd += rtmon_bsd.c
-VBoxNetNAT_SOURCES.linux   += rtmon_linux.c
-VBoxNetNAT_SOURCES.solaris += rtmon_bsd.c
-VBoxNetNAT_SOURCES.win     += \
-        rtmon_win.c \
-        RTWinPoll.cpp \
-        RTWinSocketPair.cpp
+ VBoxNetNAT_SOURCES.darwin += rtmon_bsd.c
+ VBoxNetNAT_SOURCES.freebsd += rtmon_bsd.c
+ VBoxNetNAT_SOURCES.linux  += rtmon_linux.c
+ VBoxNetNAT_SOURCES.solaris += rtmon_bsd.c
+ VBoxNetNAT_SOURCES.win    += \
+        rtmon_win.c \
+        RTWinPoll.cpp \
+        RTWinSocketPair.cpp
 
-VBoxNetNAT_LIBS = \
+ VBoxNetNAT_LIBS = \
         $(LIB_RUNTIME)
-VBoxNetNAT_LIBS.solaris += socket nsl
+ VBoxNetNAT_LIBS.solaris += socket nsl
 
-VBoxNetNAT_LDFLAGS.win = /SUBSYSTEM:windows
+ VBoxNetNAT_LDFLAGS.win = /SUBSYSTEM:windows
 
-# ifeq ($(VBOX_WITH_HARDENING),)
-#  ifn1of ($(KBUILD_TARGET), darwin win)
-#   # helper for debugging unprivileged
-#   VBoxNetNAT_DEFS += VBOX_RAWSOCK_DEBUG_HELPER
-#   VBoxNetNAT_SOURCES += getrawsock.c
-#  endif
-# endif
+ # ifeq ($(VBOX_WITH_HARDENING),)
+ #  ifn1of ($(KBUILD_TARGET), darwin win)
+ #   # helper for debugging unprivileged
+ #   VBoxNetNAT_DEFS += VBOX_RAWSOCK_DEBUG_HELPER
+ #   VBoxNetNAT_SOURCES += getrawsock.c
+ #  endif
+ # endif
 
 
  ifdef VBOX_WITH_HARDENING
-$(call VBOX_SET_VER_INFO_DLL,VBoxNetNAT,VirtualBox NAT Engine (dll),$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
+  $(call VBOX_SET_VER_INFO_DLL,VBoxNetNAT,VirtualBox NAT Engine (dll),$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
  else
-$(call VBOX_SET_VER_INFO_EXE,VBoxNetNAT,VirtualBox NAT Engine,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
+  $(call VBOX_SET_VER_INFO_EXE,VBoxNetNAT,VirtualBox NAT Engine,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
  endif