From 5420f21ce17c40c0aa953f2425cee7d25f683b10 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Thu, 3 Feb 2011 09:56:08 -0800 Subject: [PATCH] re-ran tests --- test/ipfw/Makefile | 17 +++++++++++++++++ test/ipfw/firewall.fw.orig | 6 +++--- test/ipfw/firewall1.fw.orig | 6 +++--- test/ipfw/firewall2.fw.orig | 6 +++--- test/ipfw/firewall33.fw.orig | 16 ++++++++-------- test/ipfw/firewall34.fw.orig | 6 +++--- test/ipfw/firewall4.fw.orig | 6 +++--- test/ipfw/firewall7.fw.orig | 6 +++--- test/ipfw/firewall8.fw.orig | 6 +++--- test/ipfw/firewall9.fw.orig | 6 +++--- test/ipfw/host.fw.orig | 6 +++--- test/ipfw/mac.fw.orig | 6 +++--- 12 files changed, 55 insertions(+), 38 deletions(-) create mode 100644 test/ipfw/Makefile diff --git a/test/ipfw/Makefile b/test/ipfw/Makefile new file mode 100644 index 000000000..e19b1af47 --- /dev/null +++ b/test/ipfw/Makefile @@ -0,0 +1,17 @@ + +FW_OBJECTS := $(shell fwbedit list -f objects-for-regression-tests.fwb -o /User/Firewalls -c -F%name% | sort) +# CL_OBJECTS := $(shell fwbedit list -f cluster-tests.fwb -o /User/Clusters -c -F%name% | sort) + + +$(FW_OBJECTS): + fwb_ipfw -f objects-for-regression-tests.fwb -xt $@ + +$(CL_OBJECTS): + fwb_ipfw -f cluster-tests.fwb -xt -xc $@ + +.PHONY: all firewalls clusters $(FW_OBJECTS) $(CL_OBJECTS) +all: firewalls clusters + +firewalls: $(FW_OBJECTS) + +clusters: $(CL_OBJECTS) diff --git a/test/ipfw/firewall.fw.orig b/test/ipfw/firewall.fw.orig index 9c45899e9..6d5697884 100755 --- a/test/ipfw/firewall.fw.orig +++ b/test/ipfw/firewall.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipfw v4.2.0.3426 +# Firewall Builder fwb_ipfw v4.2.0.3457 # -# Generated Mon Jan 10 16:30:56 2011 PST by vadim +# Generated Thu Feb 3 09:55:47 2011 PST by vadim # # files: * firewall.fw ipfw.fw # @@ -81,7 +81,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:30:56 2011 by vadim" +log "Activating firewall script generated Thu Feb 3 09:55:47 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/ipfw/firewall1.fw.orig b/test/ipfw/firewall1.fw.orig index 39d936179..a00ecfebc 100755 --- a/test/ipfw/firewall1.fw.orig +++ b/test/ipfw/firewall1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipfw v4.2.0.3426 +# Firewall Builder fwb_ipfw v4.2.0.3457 # -# Generated Mon Jan 10 16:30:57 2011 PST by vadim +# Generated Thu Feb 3 09:55:47 2011 PST by vadim # # files: * firewall1.fw # @@ -83,7 +83,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:30:57 2011 by vadim" +log "Activating firewall script generated Thu Feb 3 09:55:47 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/ipfw/firewall2.fw.orig b/test/ipfw/firewall2.fw.orig index 6da195280..a55b62038 100755 --- a/test/ipfw/firewall2.fw.orig +++ b/test/ipfw/firewall2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipfw v4.2.0.3426 +# Firewall Builder fwb_ipfw v4.2.0.3457 # -# Generated Mon Jan 10 16:30:57 2011 PST by vadim +# Generated Thu Feb 3 09:55:47 2011 PST by vadim # # files: * firewall2.fw # @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:30:57 2011 by vadim" +log "Activating firewall script generated Thu Feb 3 09:55:47 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/ipfw/firewall33.fw.orig b/test/ipfw/firewall33.fw.orig index 12c94254f..7666ed782 100755 --- a/test/ipfw/firewall33.fw.orig +++ b/test/ipfw/firewall33.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipfw v4.2.0.3426 +# Firewall Builder fwb_ipfw v4.2.0.3457 # -# Generated Mon Jan 10 16:30:58 2011 PST by vadim +# Generated Thu Feb 3 09:55:47 2011 PST by vadim # # files: * firewall33.fw # @@ -163,7 +163,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Mon Jan 10 16:30:58 2011 by vadim" +log "Activating firewall script generated Thu Feb 3 09:55:47 2011 by vadim" set_kernel_vars configure_interfaces @@ -221,11 +221,11 @@ prolog_commands "$IPFW" add 220 set 1 permit all from any to any keep-state || exit 1 # # Rule 8 (global) -"$IPFW" add 230 set 1 skipto 350 all from any to 74.125.224.48 || exit 1 -"$IPFW" add 240 set 1 skipto 350 all from any to 74.125.224.49 || exit 1 -"$IPFW" add 250 set 1 skipto 350 all from any to 74.125.224.50 || exit 1 -"$IPFW" add 260 set 1 skipto 350 all from any to 74.125.224.51 || exit 1 -"$IPFW" add 270 set 1 skipto 350 all from any to 74.125.224.52 || exit 1 +"$IPFW" add 230 set 1 skipto 350 all from any to 74.125.224.16 || exit 1 +"$IPFW" add 240 set 1 skipto 350 all from any to 74.125.224.17 || exit 1 +"$IPFW" add 250 set 1 skipto 350 all from any to 74.125.224.18 || exit 1 +"$IPFW" add 260 set 1 skipto 350 all from any to 74.125.224.19 || exit 1 +"$IPFW" add 270 set 1 skipto 350 all from any to 74.125.224.20 || exit 1 "$IPFW" add 280 set 1 skipto 350 all from any to 157.166.224.25 || exit 1 "$IPFW" add 290 set 1 skipto 350 all from any to 157.166.224.26 || exit 1 "$IPFW" add 300 set 1 skipto 350 all from any to 157.166.226.25 || exit 1 diff --git a/test/ipfw/firewall34.fw.orig b/test/ipfw/firewall34.fw.orig index 6b8f36549..f7ceb1f7b 100755 --- a/test/ipfw/firewall34.fw.orig +++ b/test/ipfw/firewall34.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipfw v4.2.0.3426 +# Firewall Builder fwb_ipfw v4.2.0.3457 # -# Generated Mon Jan 10 16:30:58 2011 PST by vadim +# Generated Thu Feb 3 09:55:47 2011 PST by vadim # # files: * firewall34.fw # @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:30:58 2011 by vadim" +log "Activating firewall script generated Thu Feb 3 09:55:47 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/ipfw/firewall4.fw.orig b/test/ipfw/firewall4.fw.orig index edc021e9a..7296e5596 100755 --- a/test/ipfw/firewall4.fw.orig +++ b/test/ipfw/firewall4.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipfw v4.2.0.3426 +# Firewall Builder fwb_ipfw v4.2.0.3457 # -# Generated Mon Jan 10 16:30:58 2011 PST by vadim +# Generated Thu Feb 3 09:55:48 2011 PST by vadim # # files: * firewall4.fw # @@ -80,7 +80,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:30:58 2011 by vadim" +log "Activating firewall script generated Thu Feb 3 09:55:48 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/ipfw/firewall7.fw.orig b/test/ipfw/firewall7.fw.orig index c6d53fbfa..52b528932 100755 --- a/test/ipfw/firewall7.fw.orig +++ b/test/ipfw/firewall7.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipfw v4.2.0.3426 +# Firewall Builder fwb_ipfw v4.2.0.3457 # -# Generated Mon Jan 10 16:30:59 2011 PST by vadim +# Generated Thu Feb 3 09:55:48 2011 PST by vadim # # files: * firewall7.fw # @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:30:59 2011 by vadim" +log "Activating firewall script generated Thu Feb 3 09:55:48 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/ipfw/firewall8.fw.orig b/test/ipfw/firewall8.fw.orig index aafbe8cd8..9bfd2e72e 100755 --- a/test/ipfw/firewall8.fw.orig +++ b/test/ipfw/firewall8.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipfw v4.2.0.3426 +# Firewall Builder fwb_ipfw v4.2.0.3457 # -# Generated Mon Jan 10 16:30:59 2011 PST by vadim +# Generated Thu Feb 3 09:55:48 2011 PST by vadim # # files: * firewall8.fw # @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:30:59 2011 by vadim" +log "Activating firewall script generated Thu Feb 3 09:55:48 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/ipfw/firewall9.fw.orig b/test/ipfw/firewall9.fw.orig index 7f3893423..e04f8eab3 100755 --- a/test/ipfw/firewall9.fw.orig +++ b/test/ipfw/firewall9.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipfw v4.2.0.3426 +# Firewall Builder fwb_ipfw v4.2.0.3457 # -# Generated Mon Jan 10 16:30:59 2011 PST by vadim +# Generated Thu Feb 3 09:55:48 2011 PST by vadim # # files: * firewall9.fw # @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:30:59 2011 by vadim" +log "Activating firewall script generated Thu Feb 3 09:55:48 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/ipfw/host.fw.orig b/test/ipfw/host.fw.orig index 315b06912..08a9bdb3b 100755 --- a/test/ipfw/host.fw.orig +++ b/test/ipfw/host.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipfw v4.2.0.3426 +# Firewall Builder fwb_ipfw v4.2.0.3457 # -# Generated Mon Jan 10 16:30:59 2011 PST by vadim +# Generated Thu Feb 3 09:55:48 2011 PST by vadim # # files: * host.fw # @@ -79,7 +79,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:30:59 2011 by vadim" +log "Activating firewall script generated Thu Feb 3 09:55:48 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/ipfw/mac.fw.orig b/test/ipfw/mac.fw.orig index 759ceb3f2..4f0f5ea34 100755 --- a/test/ipfw/mac.fw.orig +++ b/test/ipfw/mac.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipfw v4.2.0.3426 +# Firewall Builder fwb_ipfw v4.2.0.3457 # -# Generated Mon Jan 10 16:31:00 2011 PST by vadim +# Generated Thu Feb 3 09:55:48 2011 PST by vadim # # files: * mac.fw # @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:31:00 2011 by vadim" +log "Activating firewall script generated Thu Feb 3 09:55:48 2011 by vadim" set_kernel_vars configure_interfaces