X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fnetwork.git;a=blobdiff_plain;f=Makefile.am;h=0139f95e82e0eb268e96742cc637f8cc8b46a670;hp=4a0c4ea148a5fabb7822ff0c9210cd1459ae316b;hb=6a1b0fb170c7d66559935a6a4f8ee0e2bfdbf485;hpb=4c769bb2688dba75fa4087b83f9019e9e41a99f2

diff --git a/Makefile.am b/Makefile.am
index 4a0c4ea1..0139f95e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -127,6 +127,7 @@ EXTRA_DIST += \
 dist_network_DATA = \
 	src/functions/functions.at \
 	src/functions/functions.auth \
+	src/functions/functions.bird \
 	src/functions/functions.bonding \
 	src/functions/functions.bridge \
 	src/functions/functions.cli \
@@ -161,11 +162,13 @@ dist_network_DATA = \
 	src/functions/functions.ip-tunnel \
 	src/functions/functions.ipv4 \
 	src/functions/functions.ipv6 \
+	src/functions/functions.leds \
 	src/functions/functions.list \
 	src/functions/functions.lock \
 	src/functions/functions.logging \
 	src/functions/functions.macros \
 	src/functions/functions.modem \
+	src/functions/functions.offloading \
 	src/functions/functions.phy \
 	src/functions/functions.ports \
 	src/functions/functions.ppp \
@@ -191,10 +194,12 @@ dist_network_DATA = \
 	src/functions/functions.wpa_supplicant \
 	src/functions/functions.zone \
 	src/network-radvd-config \
-	src/dhclient-helper \
 	src/header-config \
 	src/header-port \
-	src/header-zone \
+	src/header-zone
+
+dist_network_SCRIPTS = \
+	src/dhclient-helper \
 	src/ppp/dialer \
 	src/ppp/pppoe-server
 
@@ -225,13 +230,14 @@ dist_hooks_ports_SCRIPTS = \
 	src/hooks/ports/bonding \
 	src/hooks/ports/dummy \
 	src/hooks/ports/ethernet \
+	src/hooks/ports/ip-tunnel \
 	src/hooks/ports/vlan \
 	src/hooks/ports/wireless-ap \
 	src/hooks/ports/wireless-mesh
 
 dist_hooks_zones_SCRIPTS = \
-	src/hooks/zones/6to4-tunnel \
 	src/hooks/zones/bridge \
+	src/hooks/zones/ip-tunnel \
 	src/hooks/zones/modem \
 	src/hooks/zones/pppoe \
 	src/hooks/zones/wireless
@@ -294,7 +300,15 @@ EXTRA_DIST += \
 # ------------------------------------------------------------------------------
 
 util_PROGRAMS = \
-	src/utils/network-phy-list-ht-caps
+	src/utils/network-phy-list-channels \
+	src/utils/network-phy-list-ht-caps \
+	src/utils/network-phy-list-vht-caps
+
+src_utils_network_phy_list_channels_SOURCES = \
+	src/utils/network-phy-list-channels.c
+
+src_utils_network_phy_list_channels_LDADD = \
+	src/libnetwork.la
 
 src_utils_network_phy_list_ht_caps_SOURCES = \
 	src/utils/network-phy-list-ht-caps.c
@@ -302,6 +316,12 @@ src_utils_network_phy_list_ht_caps_SOURCES = \
 src_utils_network_phy_list_ht_caps_LDADD = \
 	src/libnetwork.la
 
+src_utils_network_phy_list_vht_caps_SOURCES = \
+	src/utils/network-phy-list-vht-caps.c
+
+src_utils_network_phy_list_vht_caps_LDADD = \
+	src/libnetwork.la
+
 # ------------------------------------------------------------------------------
 
 ppp_SCRIPTS = \
@@ -440,9 +460,9 @@ MANPAGES = \
 	man/network-vpn.8 \
 	man/network-vpn-security-policies.8 \
 	man/network-zone.8 \
-	man/network-zone-6to4-tunnel.8 \
 	man/network-zone-bridge.8 \
 	man/network-zone-config-pppoe-server.8 \
+	man/network-zone-ip-tunnel.8 \
 	man/network-zone-modem.8 \
 	man/network-zone-pppoe.8 \
 	man/network-zone-wireless.8
@@ -586,45 +606,77 @@ VIRTUAL_ENVIRONMENT_IMAGES_DOWNLOAD_URL = \
 	https://people.ipfire.org/~jschlag/nitsi-ipfire/virtual-environment/basic/
 
 NITSI_INCLUDE_RECIPES = \
-	test/nitsi/include/make-install \
-	test/nitsi/include/network-reset \
-	test/nitsi/include/network-settings
+	test/nitsi/include/setup
 
 EXTRA_DIST += \
-	test/nitsi/include/make-install.in
-	test/nitsi/include/network-reset \
-	test/nitsi/include/network-settings
+	test/nitsi/include/setup.in
 
 CLEANFILES += \
-	test/nitsi/include/make-install
+	test/nitsi/include/setup
 
 NITSI_TESTS = \
-	test/nitsi/test/hello-world \
 	test/nitsi/test/make-check \
-	test/nitsi/test/raw-device-get-by-mac
+	test/nitsi/test/phase1 \
+	test/nitsi/test/pppoe \
+	test/nitsi/test/raw-device-get-by-mac \
+	test/nitsi/test/zone-new-bridge \
+	test/nitsi/test/zone-port-attach-bridge \
+	test/nitsi/test/zone/ip-tunnel/gre6 \
+	test/nitsi/test/zone/ip-tunnel/gre4 \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv4 \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv6 \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv4 \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv6 \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv4 \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv6 \
+	test/nitsi/test/port-vlan
 
 EXTRA_DIST += \
-	test/nitsi/test/hello-world/recipe \
-	test/nitsi/test/hello-world/settings \
+	test/nitsi/test/settings.in \
 	test/nitsi/test/make-check/recipe.in \
-	test/nitsi/test/make-check/settings.in
-	test/nitsi/test/raw-device-get-by-mac/recipe\
-	test/nitsi/test/raw-device-get-by-mac/settings.in
-
+	test/nitsi/test/make-check/settings.in \
+	test/nitsi/test/raw-device-get-by-mac/recipe \
+	test/nitsi/test/raw-device-get-by-mac/settings.in \
+	test/nitsi/test/zone-new-bridge/recipe \
+	test/nitsi/test/zone-new-bridge/settings.in \
+	test/nitsi/test/zone-port-attach-bridge/recipe \
+	test/nitsi/test/zone-port-attach-bridge/settings.in \
+	test/nitsi/test/zone/ip-tunnel/gre6/recipe \
+	test/nitsi/test/zone/ip-tunnel/gre6/settings \
+	test/nitsi/test/zone/ip-tunnel/gre4/recipe \
+	test/nitsi/test/zone/ip-tunnel/gre4/settings \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv4/recipe \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv4/settings \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv6/recipe \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv6/settings \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv4/recipe \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv4/settings \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv6/recipe \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv6/settings \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv4/recipe \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv4/settings \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv6/recipe \
+	test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv6/settings \
+	test/nitsi/test/port-vlan/recipe \
+	test/nitsi/test/port-vlan/settings
 
 CLEANFILES += \
+	test/nitsi/test/settings \
 	test/nitsi/test/make-check/recipe \
 	test/nitsi/test/make-check/settings \
-	test/nitsi/test/raw-device-get-by-mac/settings
+	test/nitsi/test/raw-device-get-by-mac/settings \
+	test/nitsi/test/zone-new-bridge/settings \
+	test/nitsi/test/zone-port-attach-bridge/settings
 
 NITSI_ENVIRONMENT =
 
 .PHONY: $(NITSI_TESTS)
-$(NITSI_TESTS): % : %/recipe %/settings $(VIRTUAL_ENVIRONMENT_FILES) $(VIRTUAL_ENVIRONMENT_IMAGES) $(NITSI_INCLUDE_RECIPES)
-	$(AM_V_NITSI) $(NITSI_ENVIRONMENT) $(NITSI) --log-level error run-test -d $@
+$(NITSI_TESTS): % : dist %/recipe %/settings test/nitsi/test/settings $(VIRTUAL_ENVIRONMENT_FILES) $(VIRTUAL_ENVIRONMENT_IMAGES) $(NITSI_INCLUDE_RECIPES)
+	$(AM_V_NITSI) $(NITSI_ENVIRONMENT) $(NITSI) --log-level error run-test -d $@ \
+		--default-settings $(abs_builddir)/test/nitsi/test/settings --interactive-error-handling
 
 .PHONY: nitsi
-nitsi: dist $(NITSI_TESTS)
+nitsi: $(NITSI_TESTS)
 
 # Downloads a virtual image file and extracts it
 $(VIRTUAL_ENVIRONMENT_IMAGES):