Index: /trunk/src/VBox/NetworkServices/NAT/Makefile.kmk =================================================================== --- /trunk/src/VBox/NetworkServices/NAT/Makefile.kmk (revision 82745) +++ /trunk/src/VBox/NetworkServices/NAT/Makefile.kmk (revision 82746) @@ -18,133 +18,131 @@ SUB_DEPTH = ../../../.. include $(KBUILD_PATH)/subheader.kmk -ifdef VBOX_WITH_LWIP_NAT +ifdef VBOX_WITH_LWIP_NAT # entire file -VBOX_PATH_NAT_SRC := $(PATH_SUB_CURRENT) - - # XXX: do not depend on order ifndef LWIP_SOURCES include $(PATH_SUB_CURRENT)/../../Devices/Network/lwip-new/Config.kmk endif +# +# Globals +# +VBOX_PATH_NAT_SRC := $(PATH_SUB_CURRENT) + +# +# Hardened stub exe for VBoxNetNAT. +# ifdef VBOX_WITH_HARDENING - # - # Hardened stub exe for VBoxNetLwipNAT. - # - PROGRAMS += VBoxNetLwipNATHardened - VBoxNetLwipNATHardened_TEMPLATE = VBOXR3HARDENEDEXE - VBoxNetLwipNATHardened_NAME = VBoxNetNAT - VBoxNetLwipNATHardened_DEFS = SERVICE_NAME=\"VBoxNetNAT\" - VBoxNetLwipNATHardened_SOURCES = VBoxNetNATHardened.cpp - VBoxNetLwipNATHardened_SOURCES.win = $(VBoxNetLwipNAT_0_OUTDIR)/VBoxNetLwipNAT-icon.rc - VBoxNetLwipNATHardened_LDFLAGS.win = /SUBSYSTEM:windows +PROGRAMS += VBoxNetNATHardened +VBoxNetNATHardened_TEMPLATE = VBOXR3HARDENEDEXE +VBoxNetNATHardened_NAME = VBoxNetNAT +VBoxNetNATHardened_DEFS = SERVICE_NAME=\"VBoxNetNAT\" +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 - # - # VBoxNetLwipNAT. - # +# +# VBoxNetNAT. +# ifdef VBOX_WITH_HARDENING - DLLS += VBoxNetLwipNAT +DLLS += VBoxNetNAT else - PROGRAMS += VBoxNetLwipNAT +PROGRAMS += VBoxNetNAT endif - VBoxNetLwipNAT_TEMPLATE := $(if-expr defined(VBOX_WITH_HARDENING),VBOXMAINDLL,VBOXMAINCLIENTEXE) - VBoxNetLwipNAT_NAME := VBoxNetNAT - VBoxNetLwipNAT_DEFS = IPv6 - # VBoxNetLwipNAT_DEFS.linux = WITH_VALGRIND # instrument lwip memp.c - VBoxNetLwipNAT_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 - # 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_TEMPLATE := $(if-expr defined(VBOX_WITH_HARDENING),VBOXMAINDLL,VBOXMAINCLIENTEXE) +VBoxNetNAT_NAME := VBoxNetNAT +VBoxNetNAT_DEFS = IPv6 +# 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 +# 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),) ifneq ($(int-ge $(VBOX_GCC_VERSION_CXX),40600),) - # we compile C++ code with -std=c++0x / -std=c++11 - VBoxNetLwipNAT_CFLAGS.solaris += -std=c99 - VBoxNetLwipNAT_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 - VBoxNetLwipNAT_DEFS.solaris += _XOPEN_SOURCE=500 +VBoxNetNAT_DEFS.solaris += _XOPEN_SOURCE=500 endif endif - VBoxNetLwipNAT_DEFS.solaris += __EXTENSIONS__=1 +VBoxNetNAT_DEFS.solaris += __EXTENSIONS__=1 endif - # (current dir is for for lwipopts.h) - VBoxNetLwipNAT_INCS += . $(addprefix ../../Devices/Network/lwip-new/,$(LWIP_INCS)) +# (current dir is for for lwipopts.h) +VBoxNetNAT_INCS += . $(addprefix ../../Devices/Network/lwip-new/,$(LWIP_INCS)) - VBoxNetLwipNAT_SOURCES = \ - VBoxNetLwipNAT.cpp \ - ../NetLib/VBoxNetBaseService.cpp \ - ../NetLib/VBoxNetPortForwardString.cpp \ - ../NetLib/VBoxNetIntIf.cpp \ - ../NetLib/VBoxNetUDP.cpp \ - ../NetLib/VBoxNetARP.cpp \ - ../NetLib/ComHostUtils.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/VBoxNetBaseService.cpp \ + ../NetLib/VBoxNetPortForwardString.cpp \ + ../NetLib/VBoxNetIntIf.cpp \ + ../NetLib/VBoxNetUDP.cpp \ + ../NetLib/VBoxNetARP.cpp \ + ../NetLib/ComHostUtils.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) - VBoxNetLwipNAT_SOURCES += pxping_win.c # unprivileged Icmp API +VBoxNetNAT_SOURCES += pxping_win.c # unprivileged Icmp API else - VBoxNetLwipNAT_SOURCES += pxping.c # raw sockets - VBoxNetLwipNAT_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 - VBoxNetLwipNAT_SOURCES.darwin += rtmon_bsd.c - VBoxNetLwipNAT_SOURCES.freebsd += rtmon_bsd.c - VBoxNetLwipNAT_SOURCES.linux += rtmon_linux.c - VBoxNetLwipNAT_SOURCES.solaris += rtmon_bsd.c - VBoxNetLwipNAT_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 - VBoxNetLwipNAT_LIBS = \ +VBoxNetNAT_LIBS = \ $(LIB_RUNTIME) - VBoxNetLwipNAT_LIBS.solaris += socket nsl +VBoxNetNAT_LIBS.solaris += socket nsl - VBoxNetLwipNAT_LDFLAGS.win = /SUBSYSTEM:windows +VBoxNetNAT_LDFLAGS.win = /SUBSYSTEM:windows - # ifeq ($(VBOX_WITH_HARDENING),) - # ifn1of ($(KBUILD_TARGET), darwin win) - # # helper for debugging unprivileged - # VBoxNetLwipNAT_DEFS += VBOX_RAWSOCK_DEBUG_HELPER - # VBoxNetLwipNAT_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 - ifeq ($(KBUILD_TARGET),win) - # Icon include file. - VBoxNetLwipNAT_SOURCES += VBoxNetNAT.rc - VBoxNetNAT.rc_INCS = $(VBoxNetLwipNAT_0_OUTDIR) - VBoxNetNAT.rc_DEPS = $(VBoxNetLwipNAT_0_OUTDIR)/VBoxNetLwipNAT-icon.rc - VBoxNetNAT.rc_CLEAN = $(VBoxNetLwipNAT_0_OUTDIR)/VBoxNetLwipNAT-icon.rc - $$(VBoxNetLwipNAT_0_OUTDIR)/VBoxNetLwipNAT-icon.rc: $(VBOX_WINDOWS_ICON_FILE) $$(VBoxNetLwipNAT_DEFPATH)/Makefile.kmk | $$(dir $$@) - $(RM) -f $@ - $(APPEND) $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"' - endif # win + + ifdef VBOX_WITH_HARDENING +$(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. + endif endif # VBOX_WITH_LWIP_NAT Index: unk/src/VBox/NetworkServices/NAT/VBoxNetNAT.rc =================================================================== --- /trunk/src/VBox/NetworkServices/NAT/VBoxNetNAT.rc (revision 82745) +++ (revision ) @@ -1,55 +1,0 @@ -/* $Id$ */ -/** @file - * VBoxNetNAT - Resource file containing version info. - */ - -/* - * Copyright (C) 2015-2019 Oracle Corporation - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - */ - -#include -#include - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_RC_FILE_VERSION - PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK VS_FFI_FILEFLAGSMASK - FILEFLAGS VBOX_RC_FILE_FLAGS - FILEOS VBOX_RC_FILE_OS - FILETYPE VBOX_RC_TYPE_DLL - FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" // Lang=US English, CharSet=Unicode - BEGIN - VALUE "FileDescription", "VirtualBox NAT Engine\0" - VALUE "InternalName", "VBoxNetNAT\0" - VALUE "OriginalFilename", "VBoxNetNAT.dll\0" - VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR - VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR - VBOX_RC_MORE_STRINGS - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -/* Creates the application icon. */ -#include "VBoxNetLwipNAT-icon.rc" -