Changeset 14955 in vbox for trunk/src

Timestamp:

Dec 3, 2008 8:00:42 PM (16 years ago)

Author:

vboxsync

Message:

removed the old NAT experiment

File:

• trunk/src/VBox/Devices/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -580 +580 @@
         Network/DrvNetSniffer.cpp \
         Network/Pcap.cpp
-ifndef VBOX_USE_NAT
+
 VBOX_SLIRP_SOURCES = \
         Network/DrvNAT.cpp \
@@ -601 +601 @@
         Network/slirp/tftp.c \
         Network/slirp/udp.c
+
 Drivers_SOURCES += $(VBOX_SLIRP_SOURCES)
- define def_vbox_slirp_cflags
+define def_vbox_slirp_cflags
   $(file)_DEFS += \
       VBOX_WITH_SIMPLIFIED_SLIRP_SYNC \
@@ -608 +609 @@
       $(if $(VBOX_WITH_SLIRP_MEMORY_CHECK),VBOX_WITH_SLIRP_MEMORY_CHECK,) \
       $(if $(VBOX_WITH_SLIRP_ICMP),VBOX_WITH_SLIRP_ICMP,)
-  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
-
-NatAlias_TEMPLATE   = VBOXR3NP
-Drivers_SOURCES += Network/DrvNAT.cpp
-Network/DrvNAT.cpp_DEFS += VBOX_NAT_SOURCES
-Network/nat/src/sys/net/if_clone.c_CFLAGS.linux += -std=c99
-
-Drivers_SOURCES += Network/nat/nat_socket.c
-
-NatAlias_CFLAGS += -include Network/nat/bsd.h
-#NatAlias_CFLAGS += -Werror -Wall -Wno-unused -Wno-pointer-sign
-NatAlias_DEFS += VBOX_NAT_SOURCES
-NatAlias_DEFS += __BSD_VISIBLE=1
-NatAlias_DEFS += INET
-NatAlias_DEFS += IPFIREWALL_NAT
-NatAlias_DEFS += RWLOCK_NOINLINE
-NatAlias_DEFS += MUTEX_NOINLINE
-NatAlias_DEFS += IPFIREWALL_FORWARD
-NatAlias_DEFS += IPFIREWALL
-NatAlias_DEFS += IPFIREWALL_DEFAULT_TO_ACCEPT
-
-NatAlias_DEFS += IN_NAT # used in Network/nat/nat.h (which glues VBox and *BSD sources)
-
-NatAlias_DEFS.linux   += _GNU_SOURCE
-
-NatAlias_SOURCES +=     Network/nat/nat_utils.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/ip_fw_nat.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/in_cksum.c
-NatAlias_SOURCES +=     Network/nat/src/sys/net/if.c
-NatAlias_SOURCES +=     Network/nat/src/sys/net/if_clone.c
-NatAlias_SOURCES +=     Network/nat/src/sys/net/bpf.c
-NatAlias_SOURCES +=     Network/nat/src/sys/net/if_loop.c
-NatAlias_SOURCES +=     Network/nat/src/sys/net/if_ef.c
-NatAlias_SOURCES +=     Network/nat/src/sys/net/if_ethersubr.c
-NatAlias_SOURCES +=     Network/nat/src/sys/net/route.c
-NatAlias_SOURCES +=     Network/nat/src/sys/net/pfil.c
-NatAlias_SOURCES +=     Network/nat/src/sys/net/netisr.c
-NatAlias_SOURCES +=     Network/nat/src/sys/net/radix.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/ip_options.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/tcp_timewait.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/tcp_timer.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/if_ether.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/in.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/in_pcb.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/in_proto.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/in_rmx.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/in_mcast.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/ip_icmp.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/ip_fastfwd.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/ip_output.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/ip_input.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/ip_mroute.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/ip_id.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/ip_divert.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/raw_ip.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/tcp_syncache.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/tcp_sack.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/tcp_subr.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/tcp_input.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/tcp_output.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/tcp_reass.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/tcp_hostcache.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/tcp_usrreq.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/udp_usrreq.c
-NatAlias_SOURCES +=     Network/nat/src/sys/kern/subr_eventhandler.c
-NatAlias_SOURCES +=     Network/nat/src/sys/kern/kern_mbuf.c
-NatAlias_SOURCES +=     Network/nat/src/sys/kern/kern_subr.c
-NatAlias_SOURCES +=     Network/nat/src/sys/kern/kern_resource.c
-NatAlias_SOURCES +=     Network/nat/src/sys/kern/kern_time.c
-NatAlias_SOURCES +=     Network/nat/src/sys/kern/kern_clock.c
-#NatAlias_SOURCES +=    Network/nat/src/sys/kern/kern_timeout.c
-NatAlias_SOURCES +=     Network/nat/src/sys/kern/subr_sbuf.c
-NatAlias_SOURCES +=     Network/nat/src/sys/kern/uipc_mbuf.c
-NatAlias_SOURCES +=     Network/nat/src/sys/kern/uipc_mbuf2.c
-NatAlias_SOURCES +=     Network/nat/src/sys/kern/uipc_sockbuf.c
-NatAlias_SOURCES +=     Network/nat/src/sys/kern/uipc_socket.c
-NatAlias_SOURCES +=     Network/nat/src/sys/kern/uipc_domain.c
-NatAlias_SOURCES +=     Network/nat/src/sys/vm/uma_core.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/ip_fw2.c
-NatAlias_SOURCES +=     Network/nat/src/sys/netinet/ip_fw_pfil.c
-NatAlias_SOURCES += Network/nat/src/sys/netinet/libalias/alias.c
-#NatAlias_SOURCES += Network/nat/src/sys/netinet/libalias/alias_cuseeme.c
-NatAlias_SOURCES += Network/nat/src/sys/netinet/libalias/alias_db.c
-NatAlias_SOURCES += Network/nat/src/sys/netinet/libalias/alias_dummy.c
-#NatAlias_SOURCES += Network/nat/src/sys/libalias/alias_ftp.c
-#NatAlias_SOURCES += Network/nat/src/sys/libalias/alias_irc.c
-NatAlias_SOURCES += Network/nat/src/sys/netinet/libalias/alias_mod.c
-#NatAlias_SOURCES += Network/nat/src/sys/libalias/alias_nbt.c
-#NatAlias_SOURCES += Network/nat/src/sys/libalias/alias_pptp.c
-NatAlias_SOURCES += Network/nat/src/sys/netinet/libalias/alias_proxy.c
-#NatAlias_SOURCES += Network/nat/src/sys/libalias/alias_skinny.c
-#NatAlias_SOURCES += Network/nat/src/sys/libalias/alias_smedia.c
-NatAlias_SOURCES += Network/nat/src/sys/netinet/libalias/alias_util.c
-
-NatAlias_SOURCES.amd64 +=       Network/nat/src/sys/amd64/amd64/in_cksum.c
-NatAlias_SOURCES.x86 += Network/nat/src/sys/i386/i386/in_cksum.c
-
-NatAlias_INCS += Network/nat
-NatAlias_INCS += Network/nat/src/sys
-NatAlias_INCS +=  Network/nat/src/sys/contrib/altq
-NatAlias_INCS.amd64 += Network/nat/src/sys/amd64/include
-NatAlias_INCS.x86 += Network/nat/src/sys/i386/include
-endif
+ 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)))
 
 # -- OS specific --