From 02ce7747b643347dd8c897a2fc910beb858dd757 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Thu, 20 Jan 2011 08:59:36 -0800 Subject: [PATCH] test case for redirection rule for PF --- test/pf/firewall-base-rulesets.fw.orig | 6 +-- test/pf/firewall-ipv6-1.fw.orig | 6 +-- test/pf/firewall-ipv6-2.conf.orig | 2 +- test/pf/firewall-ipv6-2.fw.orig | 6 +-- test/pf/firewall.fw.orig | 6 +-- test/pf/firewall1.conf.orig | 19 ++++--- test/pf/firewall1.fw.orig | 9 ++-- test/pf/firewall10-1.fw.orig | 6 +-- test/pf/firewall10-2.fw.orig | 6 +-- test/pf/firewall10-3.fw.orig | 6 +-- test/pf/firewall10-4.fw.orig | 6 +-- test/pf/firewall10-5.fw.orig | 6 +-- test/pf/firewall10-6.fw.orig | 6 +-- test/pf/firewall11.fw.orig | 6 +-- test/pf/firewall12.fw.orig | 6 +-- test/pf/firewall13.fw.orig | 6 +-- test/pf/firewall14-1.fw.orig | 6 +-- test/pf/firewall14.fw.orig | 6 +-- test/pf/firewall2-1.fw.orig | 6 +-- test/pf/firewall2.fw.orig | 6 +-- test/pf/firewall20.fw.orig | 6 +-- test/pf/firewall21.fw.orig | 6 +-- test/pf/firewall22.fw.orig | 6 +-- test/pf/firewall3.fw.orig | 8 +-- test/pf/firewall33.conf.orig | 2 +- test/pf/firewall33.fw.orig | 6 +-- test/pf/firewall34.fw.orig | 6 +-- test/pf/firewall38.fw.orig | 6 +-- test/pf/firewall39.fw.orig | 6 +-- test/pf/firewall4.fw.orig | 6 +-- test/pf/firewall40-1.fw.orig | 6 +-- test/pf/firewall40.fw.orig | 6 +-- test/pf/firewall41.fw.orig | 6 +-- test/pf/firewall5.fw.orig | 6 +-- test/pf/firewall51.fw.orig | 6 +-- test/pf/firewall6.fw.orig | 6 +-- test/pf/firewall62.fw.orig | 6 +-- test/pf/firewall63.fw.orig | 6 +-- test/pf/firewall7.fw.orig | 6 +-- test/pf/firewall70.fw.orig | 6 +-- test/pf/firewall8.fw.orig | 6 +-- test/pf/firewall80-4.5.fw.orig | 6 +-- test/pf/firewall80.fw.orig | 6 +-- test/pf/firewall9.fw.orig | 6 +-- test/pf/firewall91.fw.orig | 6 +-- test/pf/firewall92.fw.orig | 6 +-- test/pf/objects-for-regression-tests.fwb | 65 ++++++++++++++++++++++-- test/pf/pf_cluster_1_openbsd-1.fw.orig | 6 +-- test/pf/pf_cluster_1_openbsd-2.fw.orig | 6 +-- test/pf/pf_cluster_2_freebsd-2.fw.orig | 6 +-- test/pf/pf_cluster_3_openbsd-3.fw.orig | 6 +-- test/pf/pf_cluster_3_openbsd-4.fw.orig | 6 +-- 52 files changed, 223 insertions(+), 158 deletions(-) diff --git a/test/pf/firewall-base-rulesets.fw.orig b/test/pf/firewall-base-rulesets.fw.orig index d616436ef..06b08213e 100755 --- a/test/pf/firewall-base-rulesets.fw.orig +++ b/test/pf/firewall-base-rulesets.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:34 2011 PST by vadim +# Generated Thu Jan 20 08:58:05 2011 PST by vadim # # files: * firewall-base-rulesets.fw # files: firewall-base-rulesets.conf @@ -163,7 +163,7 @@ configure_interfaces() { update_addresses_of_interface "en2 192.168.100.1/0xffffff00" "" } -log "Activating firewall script generated Mon Jan 10 16:36:34 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:58:05 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall-ipv6-1.fw.orig b/test/pf/firewall-ipv6-1.fw.orig index bb655b4ef..56d03059a 100755 --- a/test/pf/firewall-ipv6-1.fw.orig +++ b/test/pf/firewall-ipv6-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:35 2011 PST by vadim +# Generated Thu Jan 20 08:58:06 2011 PST by vadim # # files: * firewall-ipv6-1.fw pf-ipv6.fw # files: firewall-ipv6-1-Policy_ipv4.conf /etc/fw/pf-ipv6-Policy_ipv4.conf @@ -175,7 +175,7 @@ configure_interfaces() { update_addresses_of_interface "lo ::1/128 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Mon Jan 10 16:36:35 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:58:06 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall-ipv6-2.conf.orig b/test/pf/firewall-ipv6-2.conf.orig index 66680467e..e7847d477 100644 --- a/test/pf/firewall-ipv6-2.conf.orig +++ b/test/pf/firewall-ipv6-2.conf.orig @@ -5,7 +5,7 @@ # Tables: (5) table { 222.222.222.22 , 222.222.222.23 } table { 2001:5c0:0:2::24 , 3ffe:1200:2000::/36 , 3ffe:1200:2001:1:8000::1 } -table { 61.150.47.112 , 74.125.224.48 , 74.125.224.49 , 74.125.224.50 , 74.125.224.51 , 74.125.224.52 , 192.168.1.0 } +table { 61.150.47.112 , 74.125.224.16 , 74.125.224.17 , 74.125.224.18 , 74.125.224.19 , 74.125.224.20 , 192.168.1.0 } table { 2001:5c0:0:2::24 , 3ffe:1200:2001:1:8000::1 } table { 61.150.47.112 , 192.168.1.0 } diff --git a/test/pf/firewall-ipv6-2.fw.orig b/test/pf/firewall-ipv6-2.fw.orig index 0c3ff7f06..0e9708f6c 100755 --- a/test/pf/firewall-ipv6-2.fw.orig +++ b/test/pf/firewall-ipv6-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:36 2011 PST by vadim +# Generated Thu Jan 20 08:58:06 2011 PST by vadim # # files: * firewall-ipv6-2.fw pf.fw # files: firewall-ipv6-2.conf pf.conf @@ -179,7 +179,7 @@ configure_interfaces() { update_addresses_of_interface "lo ::1/128 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Mon Jan 10 16:36:36 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:58:06 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall.fw.orig b/test/pf/firewall.fw.orig index 826a1cb49..35a09f7a8 100755 --- a/test/pf/firewall.fw.orig +++ b/test/pf/firewall.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:03 2011 PST by vadim +# Generated Thu Jan 20 08:57:34 2011 PST by vadim # # files: * firewall.fw /etc/pf.fw # files: firewall.conf /etc/pf.conf @@ -167,7 +167,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Mon Jan 10 16:36:03 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:34 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall1.conf.orig b/test/pf/firewall1.conf.orig index 3c635b65b..525bd3479 100644 --- a/test/pf/firewall1.conf.orig +++ b/test/pf/firewall1.conf.orig @@ -22,10 +22,13 @@ scrub in all fragment reassemble table { 22.22.22.22 , 192.168.1.1 } table { 192.168.1.10 , 192.168.1.20 } table { 22.22.22.22 , 22.22.23.23 , 192.168.1.1 , 192.168.2.0/24 , 192.168.2.1 } -table { 33.33.33.0/24 , 33.33.44.0/24 } +table { 33.33.33.0/24 , 33.33.44.0/24 } table { 192.168.1.0/24 , 192.168.2.0/24 } table { 22.22.22.22 , 22.22.23.23 , 192.168.1.1 , 192.168.2.1 } +# NAT compiler errors and warnings: +# firewall1:NAT:13: error: There should be no more than one object in original destination +# firewall1:NAT:13: error: There should be no more than one object in original destination # # Rule 0 (NAT) no nat proto {tcp udp icmp} from 192.168.1.0/24 to 192.168.2.0/24 @@ -82,13 +85,17 @@ rdr proto tcp from 192.168.1.0/24 to ! 192.168.1.1 port 80 -> 127.0.0.1 port 312 rdr proto tcp from to ! port 80 -> 127.0.0.1 port 3128 # # Rule 12 (NAT) -rdr proto tcp from ! to port 80 -> 127.0.0.1 port 3128 -# -# Rule 13 (NAT) -rdr proto tcp from ! 192.168.1.10 to any port 80 -> 127.0.0.1 port 3128 +rdr proto tcp from 192.168.1.0/24 to ! port 80 -> 127.0.0.1 port 3128 +rdr proto tcp from 192.168.1.0/24 to ! port 81 -> 127.0.0.1 port 3128 # # Rule 14 (NAT) -rdr on eth1 proto tcp from to 22.22.22.22 port 80 -> 192.168.1.10 port 80 +rdr proto tcp from ! to port 80 -> 127.0.0.1 port 3128 +# +# Rule 15 (NAT) +rdr proto tcp from ! 192.168.1.10 to any port 80 -> 127.0.0.1 port 3128 +# +# Rule 16 (NAT) +rdr on eth1 proto tcp from to 22.22.22.22 port 80 -> 192.168.1.10 port 80 # Policy compiler errors and warnings: # firewall1:Policy:10: warning: Changing rule direction due to self reference diff --git a/test/pf/firewall1.fw.orig b/test/pf/firewall1.fw.orig index 9808ec5b1..138627ec8 100755 --- a/test/pf/firewall1.fw.orig +++ b/test/pf/firewall1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:04 2011 PST by vadim +# Generated Thu Jan 20 08:57:35 2011 PST by vadim # # files: * firewall1.fw # files: firewall1.conf @@ -15,6 +15,9 @@ # Also using interface policy on eth1 to test specific case with negation and # rule shading depection +# firewall1:NAT:13: error: There should be no more than one object in original destination +# firewall1:NAT:13: error: There should be no more than one object in original destination + # firewall1:Policy:10: warning: Changing rule direction due to self reference # firewall1:Policy:18: warning: Changing rule direction due to self reference @@ -76,7 +79,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:36:04 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:35 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-1.fw.orig b/test/pf/firewall10-1.fw.orig index 8cfb753b1..1f554e395 100755 --- a/test/pf/firewall10-1.fw.orig +++ b/test/pf/firewall10-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:05 2011 PST by vadim +# Generated Thu Jan 20 08:57:35 2011 PST by vadim # # files: * firewall10-1.fw # files: firewall10-1.conf @@ -74,7 +74,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:36:05 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:35 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-2.fw.orig b/test/pf/firewall10-2.fw.orig index dfa916d5b..a01642a7c 100755 --- a/test/pf/firewall10-2.fw.orig +++ b/test/pf/firewall10-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:06 2011 PST by vadim +# Generated Thu Jan 20 08:57:36 2011 PST by vadim # # files: * firewall10-2.fw # files: firewall10-2.conf @@ -74,7 +74,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:36:06 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:36 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-3.fw.orig b/test/pf/firewall10-3.fw.orig index d1e74c281..03b77463a 100755 --- a/test/pf/firewall10-3.fw.orig +++ b/test/pf/firewall10-3.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:06 2011 PST by vadim +# Generated Thu Jan 20 08:57:37 2011 PST by vadim # # files: * firewall10-3.fw # files: firewall10-3.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:36:06 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:37 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-4.fw.orig b/test/pf/firewall10-4.fw.orig index cbfe511b6..a1a0600a6 100755 --- a/test/pf/firewall10-4.fw.orig +++ b/test/pf/firewall10-4.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:07 2011 PST by vadim +# Generated Thu Jan 20 08:57:38 2011 PST by vadim # # files: * firewall10-4.fw # files: firewall10-4.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:36:07 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:38 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-5.fw.orig b/test/pf/firewall10-5.fw.orig index 7179e9545..ae0844a83 100755 --- a/test/pf/firewall10-5.fw.orig +++ b/test/pf/firewall10-5.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:08 2011 PST by vadim +# Generated Thu Jan 20 08:57:38 2011 PST by vadim # # files: * firewall10-5.fw # files: firewall10-5.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:36:08 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:38 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-6.fw.orig b/test/pf/firewall10-6.fw.orig index 5fb966a52..533a6d538 100755 --- a/test/pf/firewall10-6.fw.orig +++ b/test/pf/firewall10-6.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:09 2011 PST by vadim +# Generated Thu Jan 20 08:57:39 2011 PST by vadim # # files: * firewall10-6.fw # files: firewall10-6.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:36:09 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:39 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall11.fw.orig b/test/pf/firewall11.fw.orig index bb74b7b92..c64527152 100755 --- a/test/pf/firewall11.fw.orig +++ b/test/pf/firewall11.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:09 2011 PST by vadim +# Generated Thu Jan 20 08:57:40 2011 PST by vadim # # files: * firewall11.fw # files: firewall11.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:36:09 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:40 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall12.fw.orig b/test/pf/firewall12.fw.orig index b0b265d5d..8c6c9647c 100755 --- a/test/pf/firewall12.fw.orig +++ b/test/pf/firewall12.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:10 2011 PST by vadim +# Generated Thu Jan 20 08:57:41 2011 PST by vadim # # files: * firewall12.fw # files: firewall12.conf @@ -159,7 +159,7 @@ configure_interfaces() { update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Mon Jan 10 16:36:10 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:41 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall13.fw.orig b/test/pf/firewall13.fw.orig index f14d73143..50cbff8c0 100755 --- a/test/pf/firewall13.fw.orig +++ b/test/pf/firewall13.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:11 2011 PST by vadim +# Generated Thu Jan 20 08:57:41 2011 PST by vadim # # files: * firewall13.fw # files: firewall13.conf @@ -88,7 +88,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:36:11 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:41 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall14-1.fw.orig b/test/pf/firewall14-1.fw.orig index 03d4531c5..e2eee4ba0 100755 --- a/test/pf/firewall14-1.fw.orig +++ b/test/pf/firewall14-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:12 2011 PST by vadim +# Generated Thu Jan 20 08:57:43 2011 PST by vadim # # files: * firewall14-1.fw # files: firewall14-1.conf @@ -244,7 +244,7 @@ configure_interfaces() { update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" "" } -log "Activating firewall script generated Mon Jan 10 16:36:12 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:43 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall14.fw.orig b/test/pf/firewall14.fw.orig index 69ea23bd0..faa691f90 100755 --- a/test/pf/firewall14.fw.orig +++ b/test/pf/firewall14.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:12 2011 PST by vadim +# Generated Thu Jan 20 08:57:42 2011 PST by vadim # # files: * firewall14.fw # files: firewall14.conf @@ -244,7 +244,7 @@ configure_interfaces() { update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" "" } -log "Activating firewall script generated Mon Jan 10 16:36:12 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:42 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall2-1.fw.orig b/test/pf/firewall2-1.fw.orig index 5bd16ab82..167fc7ba7 100755 --- a/test/pf/firewall2-1.fw.orig +++ b/test/pf/firewall2-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:15 2011 PST by vadim +# Generated Thu Jan 20 08:57:46 2011 PST by vadim # # files: * firewall2-1.fw # files: firewall2-1.conf @@ -89,7 +89,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:36:15 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:46 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall2.fw.orig b/test/pf/firewall2.fw.orig index d2f5888ce..ab6bde937 100755 --- a/test/pf/firewall2.fw.orig +++ b/test/pf/firewall2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:13 2011 PST by vadim +# Generated Thu Jan 20 08:57:44 2011 PST by vadim # # files: * firewall2.fw # files: firewall2.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:36:13 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:44 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall20.fw.orig b/test/pf/firewall20.fw.orig index f02666061..37305a242 100755 --- a/test/pf/firewall20.fw.orig +++ b/test/pf/firewall20.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:14 2011 PST by vadim +# Generated Thu Jan 20 08:57:44 2011 PST by vadim # # files: * firewall20.fw # files: firewall20.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:36:14 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:44 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall21.fw.orig b/test/pf/firewall21.fw.orig index 961896a6b..1d7c5f120 100755 --- a/test/pf/firewall21.fw.orig +++ b/test/pf/firewall21.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:15 2011 PST by vadim +# Generated Thu Jan 20 08:57:45 2011 PST by vadim # # files: * firewall21.fw # files: firewall21-NAT_1.conf @@ -82,7 +82,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:36:15 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:45 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall22.fw.orig b/test/pf/firewall22.fw.orig index 5ba5ee337..773160e54 100755 --- a/test/pf/firewall22.fw.orig +++ b/test/pf/firewall22.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:16 2011 PST by vadim +# Generated Thu Jan 20 08:57:47 2011 PST by vadim # # files: * firewall22.fw # files: firewall22-NAT_1.conf @@ -80,7 +80,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:36:16 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:47 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall3.fw.orig b/test/pf/firewall3.fw.orig index d2d113cc2..ac5028e3d 100755 --- a/test/pf/firewall3.fw.orig +++ b/test/pf/firewall3.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:17 2011 PST by vadim +# Generated Thu Jan 20 08:57:48 2011 PST by vadim # # files: * firewall3.fw # files: firewall3.conf @@ -154,12 +154,12 @@ run_epilog_and_exit() { configure_interfaces() { : - update_addresses_of_interface "le0 22.22.22.21/0xffffff00 22.22.22.22/0xffffff00 22.22.22.1/0xffffff00 22.22.22.0/0xffffff00" "" + update_addresses_of_interface "le0 22.22.22.21/0xffffff00 22.22.22.22/0xffffff00 22.22.22.0/0xffffff00 22.22.22.1/0xffffff00" "" update_addresses_of_interface "le1 192.168.1.1/0xffffff00" "" update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Mon Jan 10 16:36:17 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:48 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall33.conf.orig b/test/pf/firewall33.conf.orig index 6ada3a049..23e568df9 100644 --- a/test/pf/firewall33.conf.orig +++ b/test/pf/firewall33.conf.orig @@ -6,7 +6,7 @@ table { 157.166.224.25 , 157.166.224.26 , 157.166.226.25 , 157.166.226.26 , 157.166.255.18 , 157.166.255.19 } table { www.google.com , 157.166.224.25 , 157.166.224.26 , 157.166.226.25 , 157.166.226.26 , 157.166.255.18 , 157.166.255.19 } table { www.google.com , www.cnn.com } -table { 74.125.224.48 , 74.125.224.49 , 74.125.224.50 , 74.125.224.51 , 74.125.224.52 , 157.166.224.25 , 157.166.224.26 , 157.166.226.25 , 157.166.226.26 , 157.166.255.18 , 157.166.255.19 } +table { 74.125.224.16 , 74.125.224.17 , 74.125.224.18 , 74.125.224.19 , 74.125.224.20 , 157.166.224.25 , 157.166.224.26 , 157.166.226.25 , 157.166.226.26 , 157.166.255.18 , 157.166.255.19 } # # Rule 0 (NAT) diff --git a/test/pf/firewall33.fw.orig b/test/pf/firewall33.fw.orig index 4ca038b35..1655f7a7f 100755 --- a/test/pf/firewall33.fw.orig +++ b/test/pf/firewall33.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:18 2011 PST by vadim +# Generated Thu Jan 20 08:57:48 2011 PST by vadim # # files: * firewall33.fw # files: firewall33.conf @@ -162,7 +162,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Mon Jan 10 16:36:18 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:48 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall34.fw.orig b/test/pf/firewall34.fw.orig index a9f920b00..1dcf9fb69 100755 --- a/test/pf/firewall34.fw.orig +++ b/test/pf/firewall34.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:19 2011 PST by vadim +# Generated Thu Jan 20 08:57:49 2011 PST by vadim # # files: * firewall34.fw # files: firewall34.conf @@ -158,7 +158,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Mon Jan 10 16:36:19 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:49 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall38.fw.orig b/test/pf/firewall38.fw.orig index c41aa6b2e..93807eeca 100755 --- a/test/pf/firewall38.fw.orig +++ b/test/pf/firewall38.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:19 2011 PST by vadim +# Generated Thu Jan 20 08:57:50 2011 PST by vadim # # files: * firewall38.fw # files: firewall38.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:36:19 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:50 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall39.fw.orig b/test/pf/firewall39.fw.orig index 5ac4326a0..757a5feb2 100755 --- a/test/pf/firewall39.fw.orig +++ b/test/pf/firewall39.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:20 2011 PST by vadim +# Generated Thu Jan 20 08:57:51 2011 PST by vadim # # files: * firewall39.fw pf.fw # files: firewall39.conf pf.conf @@ -79,7 +79,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:36:20 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:51 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall4.fw.orig b/test/pf/firewall4.fw.orig index 2bb2f9716..8e0aaba08 100755 --- a/test/pf/firewall4.fw.orig +++ b/test/pf/firewall4.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:21 2011 PST by vadim +# Generated Thu Jan 20 08:57:52 2011 PST by vadim # # files: * firewall4.fw pf.fw # files: firewall4.conf /etc/fw/pf.conf @@ -78,7 +78,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:36:21 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:52 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall40-1.fw.orig b/test/pf/firewall40-1.fw.orig index 2711f5942..a31c77339 100755 --- a/test/pf/firewall40-1.fw.orig +++ b/test/pf/firewall40-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:23 2011 PST by vadim +# Generated Thu Jan 20 08:57:53 2011 PST by vadim # # files: * firewall40-1.fw # files: firewall40-1.conf @@ -176,7 +176,7 @@ configure_interfaces() { update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Mon Jan 10 16:36:23 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:53 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall40.fw.orig b/test/pf/firewall40.fw.orig index a5a3837bf..0bed9cc1a 100755 --- a/test/pf/firewall40.fw.orig +++ b/test/pf/firewall40.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:22 2011 PST by vadim +# Generated Thu Jan 20 08:57:52 2011 PST by vadim # # files: * firewall40.fw # files: firewall40.conf @@ -160,7 +160,7 @@ configure_interfaces() { update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Mon Jan 10 16:36:22 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:52 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall41.fw.orig b/test/pf/firewall41.fw.orig index 538a624df..c17e68847 100755 --- a/test/pf/firewall41.fw.orig +++ b/test/pf/firewall41.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:23 2011 PST by vadim +# Generated Thu Jan 20 08:57:54 2011 PST by vadim # # files: * firewall41.fw # files: firewall41.conf @@ -163,7 +163,7 @@ configure_interfaces() { update_addresses_of_interface "eth1 2.2.2.2/0xffffff00" "" } -log "Activating firewall script generated Mon Jan 10 16:36:23 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:54 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall5.fw.orig b/test/pf/firewall5.fw.orig index b06cf301e..c35283aa0 100755 --- a/test/pf/firewall5.fw.orig +++ b/test/pf/firewall5.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:24 2011 PST by vadim +# Generated Thu Jan 20 08:57:55 2011 PST by vadim # # files: * firewall5.fw # files: firewall5.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:36:24 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:55 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall51.fw.orig b/test/pf/firewall51.fw.orig index ca49cd92c..728b85d0b 100755 --- a/test/pf/firewall51.fw.orig +++ b/test/pf/firewall51.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:25 2011 PST by vadim +# Generated Thu Jan 20 08:57:56 2011 PST by vadim # # files: * firewall51.fw # files: firewall51.conf @@ -80,7 +80,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:36:25 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:56 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall6.fw.orig b/test/pf/firewall6.fw.orig index 6bebcb1bc..85495b69f 100755 --- a/test/pf/firewall6.fw.orig +++ b/test/pf/firewall6.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:26 2011 PST by vadim +# Generated Thu Jan 20 08:57:56 2011 PST by vadim # # files: * firewall6.fw # files: firewall6.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:36:26 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:56 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall62.fw.orig b/test/pf/firewall62.fw.orig index 5eb95d3bb..b3a9db98c 100755 --- a/test/pf/firewall62.fw.orig +++ b/test/pf/firewall62.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:27 2011 PST by vadim +# Generated Thu Jan 20 08:57:57 2011 PST by vadim # # files: * firewall62.fw # files: firewall62.conf @@ -185,7 +185,7 @@ configure_interfaces() { update_addresses_of_interface "en1 222.222.222.222/0xffffff00" "" } -log "Activating firewall script generated Mon Jan 10 16:36:27 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:57 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall63.fw.orig b/test/pf/firewall63.fw.orig index 8fe8ec2c1..954b3fc4d 100755 --- a/test/pf/firewall63.fw.orig +++ b/test/pf/firewall63.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:27 2011 PST by vadim +# Generated Thu Jan 20 08:57:58 2011 PST by vadim # # files: * firewall63.fw # files: firewall63.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:36:27 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:58 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall7.fw.orig b/test/pf/firewall7.fw.orig index f69aa8001..485c53130 100755 --- a/test/pf/firewall7.fw.orig +++ b/test/pf/firewall7.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:28 2011 PST by vadim +# Generated Thu Jan 20 08:57:59 2011 PST by vadim # # files: * firewall7.fw # files: firewall7.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:36:28 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:59 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall70.fw.orig b/test/pf/firewall70.fw.orig index 3bf7158a5..2d83f6a51 100755 --- a/test/pf/firewall70.fw.orig +++ b/test/pf/firewall70.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:29 2011 PST by vadim +# Generated Thu Jan 20 08:57:59 2011 PST by vadim # # files: * firewall70.fw # files: firewall70.conf @@ -82,7 +82,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:36:29 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:57:59 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall8.fw.orig b/test/pf/firewall8.fw.orig index 06f887d42..0f9d25093 100755 --- a/test/pf/firewall8.fw.orig +++ b/test/pf/firewall8.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:30 2011 PST by vadim +# Generated Thu Jan 20 08:58:00 2011 PST by vadim # # files: * firewall8.fw # files: firewall8.conf @@ -72,7 +72,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:36:30 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:58:00 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall80-4.5.fw.orig b/test/pf/firewall80-4.5.fw.orig index 94489be96..2614bb9a9 100755 --- a/test/pf/firewall80-4.5.fw.orig +++ b/test/pf/firewall80-4.5.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:31 2011 PST by vadim +# Generated Thu Jan 20 08:58:02 2011 PST by vadim # # files: * firewall80-4.5.fw # files: firewall80-4.5.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:36:31 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:58:02 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall80.fw.orig b/test/pf/firewall80.fw.orig index 1c92dce61..a4328af69 100755 --- a/test/pf/firewall80.fw.orig +++ b/test/pf/firewall80.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:30 2011 PST by vadim +# Generated Thu Jan 20 08:58:01 2011 PST by vadim # # files: * firewall80.fw # files: firewall80.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:36:30 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:58:01 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall9.fw.orig b/test/pf/firewall9.fw.orig index 1899ef09c..99b2478e4 100755 --- a/test/pf/firewall9.fw.orig +++ b/test/pf/firewall9.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:32 2011 PST by vadim +# Generated Thu Jan 20 08:58:02 2011 PST by vadim # # files: * firewall9.fw # files: firewall9.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Jan 10 16:36:32 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:58:02 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall91.fw.orig b/test/pf/firewall91.fw.orig index ed07213e8..58feb3c8e 100755 --- a/test/pf/firewall91.fw.orig +++ b/test/pf/firewall91.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:33 2011 PST by vadim +# Generated Thu Jan 20 08:58:03 2011 PST by vadim # # files: * firewall91.fw /etc/fw/pf.fw # files: firewall91.conf /etc/fw/pf.conf @@ -243,7 +243,7 @@ configure_interfaces() { update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" "" } -log "Activating firewall script generated Mon Jan 10 16:36:33 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:58:03 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall92.fw.orig b/test/pf/firewall92.fw.orig index bde4f4073..02d88bf12 100755 --- a/test/pf/firewall92.fw.orig +++ b/test/pf/firewall92.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:33 2011 PST by vadim +# Generated Thu Jan 20 08:58:04 2011 PST by vadim # # files: * firewall92.fw /etc/fw/pf.fw # files: firewall92.conf /etc/fw/path\ with\ space/pf.conf @@ -160,7 +160,7 @@ configure_interfaces() { update_addresses_of_interface "em1 10.1.1.81/0xffffff00" "" } -log "Activating firewall script generated Mon Jan 10 16:36:33 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:58:04 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/objects-for-regression-tests.fwb b/test/pf/objects-for-regression-tests.fwb index 1c9a20413..156f28ba3 100644 --- a/test/pf/objects-for-regression-tests.fwb +++ b/test/pf/objects-for-regression-tests.fwb @@ -1,6 +1,6 @@ - + @@ -143,6 +143,12 @@ + + + + + + @@ -205,6 +211,7 @@ + @@ -1529,6 +1536,7 @@ + @@ -2053,6 +2061,7 @@ + @@ -2905,7 +2914,7 @@ - + @@ -3161,7 +3170,53 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3182,7 +3237,7 @@ - + @@ -3203,7 +3258,7 @@ - + diff --git a/test/pf/pf_cluster_1_openbsd-1.fw.orig b/test/pf/pf_cluster_1_openbsd-1.fw.orig index 0d6b530c2..0f8e044b8 100755 --- a/test/pf/pf_cluster_1_openbsd-1.fw.orig +++ b/test/pf/pf_cluster_1_openbsd-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:36 2011 PST by vadim +# Generated Thu Jan 20 08:58:07 2011 PST by vadim # # files: * pf_cluster_1_openbsd-1.fw # files: pf_cluster_1_openbsd-1.conf @@ -291,7 +291,7 @@ configure_interfaces() { $IFCONFIG pfsync0 up } -log "Activating firewall script generated Mon Jan 10 16:36:36 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:58:07 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_1_openbsd-2.fw.orig b/test/pf/pf_cluster_1_openbsd-2.fw.orig index b01685246..7c97d2778 100755 --- a/test/pf/pf_cluster_1_openbsd-2.fw.orig +++ b/test/pf/pf_cluster_1_openbsd-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:36 2011 PST by vadim +# Generated Thu Jan 20 08:58:07 2011 PST by vadim # # files: * pf_cluster_1_openbsd-2.fw # files: pf_cluster_1_openbsd-2.conf @@ -187,7 +187,7 @@ configure_interfaces() { update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Mon Jan 10 16:36:36 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:58:07 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_2_freebsd-2.fw.orig b/test/pf/pf_cluster_2_freebsd-2.fw.orig index 25dbc5a6f..e0a98b90e 100755 --- a/test/pf/pf_cluster_2_freebsd-2.fw.orig +++ b/test/pf/pf_cluster_2_freebsd-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:37 2011 PST by vadim +# Generated Thu Jan 20 08:58:07 2011 PST by vadim # # files: * pf_cluster_2_freebsd-2.fw # files: pf_cluster_2_freebsd-2.conf @@ -190,7 +190,7 @@ configure_interfaces() { update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Mon Jan 10 16:36:37 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:58:07 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_3_openbsd-3.fw.orig b/test/pf/pf_cluster_3_openbsd-3.fw.orig index 353d1d9f6..2a3bbaf38 100755 --- a/test/pf/pf_cluster_3_openbsd-3.fw.orig +++ b/test/pf/pf_cluster_3_openbsd-3.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:37 2011 PST by vadim +# Generated Thu Jan 20 08:58:07 2011 PST by vadim # # files: * pf_cluster_3_openbsd-3.fw # files: pf_cluster_3_openbsd-3.conf @@ -303,7 +303,7 @@ configure_interfaces() { sync_pfsync_interfaces } -log "Activating firewall script generated Mon Jan 10 16:36:37 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:58:07 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_3_openbsd-4.fw.orig b/test/pf/pf_cluster_3_openbsd-4.fw.orig index bf1ce46ff..e04f7c5c1 100755 --- a/test/pf/pf_cluster_3_openbsd-4.fw.orig +++ b/test/pf/pf_cluster_3_openbsd-4.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3426 +# Firewall Builder fwb_pf v4.2.0.3439 # -# Generated Mon Jan 10 16:36:37 2011 PST by vadim +# Generated Thu Jan 20 08:58:07 2011 PST by vadim # # files: * pf_cluster_3_openbsd-4.fw # files: pf_cluster_3_openbsd-4.conf @@ -192,7 +192,7 @@ configure_interfaces() { update_addresses_of_interface "carp2 172.20.0.1/0xffffff00" "" } -log "Activating firewall script generated Mon Jan 10 16:36:37 2011 by vadim" +log "Activating firewall script generated Thu Jan 20 08:58:07 2011 by vadim" set_kernel_vars configure_interfaces