diff --git a/src/pflib/PolicyCompiler_pf.cpp b/src/pflib/PolicyCompiler_pf.cpp index b1e418f85..a8b100179 100644 --- a/src/pflib/PolicyCompiler_pf.cpp +++ b/src/pflib/PolicyCompiler_pf.cpp @@ -768,15 +768,13 @@ bool PolicyCompiler_pf::addLoopbackForRedirect::processNext() for (FWObject::iterator i=srv->begin(); i!=srv->end(); i++) { - FWObject *o1= *i; - if (FWReference::cast(o1)!=NULL) o1=FWReference::cast(o1)->getPointer(); - Service *s=Service::cast( o1 ); + FWObject *o1 = FWReference::getObject(*i); + Service *s = Service::cast( o1 ); assert(s); for (FWObject::iterator j=dst->begin(); j!=dst->end(); j++) { - FWObject *o2= *j; - if (FWReference::cast(o2)!=NULL) o2=FWReference::cast(o2)->getPointer(); + FWObject *o2 = FWReference::getObject(*j); Address *a = Address::cast( o2 ); assert(a); @@ -784,8 +782,10 @@ bool PolicyCompiler_pf::addLoopbackForRedirect::processNext() for (k=pf_comp->redirect_rules_info->begin(); k!=pf_comp->redirect_rules_info->end(); ++k) { - FWObject *old_tdst_obj = compiler->dbcopy->findInIndex(k->old_tdst); - FWObject *tsrv_obj = compiler->dbcopy->findInIndex(k->tsrv); + Address *old_tdst_obj = Address::cast( + compiler->dbcopy->findInIndex(k->old_tdst)); + Service *tsrv_obj = Service::cast( + compiler->dbcopy->findInIndex(k->tsrv)); if ( *a == *(old_tdst_obj) && *s == *(tsrv_obj) ) { diff --git a/test/pf/firewall-base-rulesets.fw.orig b/test/pf/firewall-base-rulesets.fw.orig index 7ecd3067c..164811c67 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:35 2011 PST by vadim +# Generated Fri Mar 11 10:33:01 2011 PST by vadim # # files: * firewall-base-rulesets.fw /etc/fw/firewall-base-rulesets.fw # files: firewall-base-rulesets.conf /etc/fw/firewall-base-rulesets.conf @@ -169,7 +169,7 @@ configure_interfaces() { update_addresses_of_interface "en2 192.168.100.1/0xffffff00" "" } -log "Activating firewall script generated Thu Mar 10 21:08:35 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:33:01 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 fb32dbf78..6be82e65a 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:35 2011 PST by vadim +# Generated Fri Mar 11 10:33:01 2011 PST by vadim # # files: * firewall-ipv6-1.fw pf-ipv6.fw # files: firewall-ipv6-1.conf /etc/fw/pf-ipv6.conf @@ -181,7 +181,7 @@ configure_interfaces() { update_addresses_of_interface "lo ::1/128 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Mar 10 21:08:35 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:33:01 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall-ipv6-2.fw.orig b/test/pf/firewall-ipv6-2.fw.orig index 3a43d0838..44e4aab26 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:37 2011 PST by vadim +# Generated Fri Mar 11 10:33:03 2011 PST by vadim # # files: * firewall-ipv6-2.fw pf.fw # files: firewall-ipv6-2.conf pf.conf @@ -185,7 +185,7 @@ configure_interfaces() { update_addresses_of_interface "lo ::1/128 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Mar 10 21:08:37 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:33:03 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall-ipv6-3.fw.orig b/test/pf/firewall-ipv6-3.fw.orig index 7d2173fed..970b5809b 100755 --- a/test/pf/firewall-ipv6-3.fw.orig +++ b/test/pf/firewall-ipv6-3.fw.orig @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:37 2011 PST by vadim +# Generated Fri Mar 11 10:33:03 2011 PST by vadim # # files: * firewall-ipv6-3.fw /etc/firewall-ipv6-3.fw # files: firewall-ipv6-3.conf /etc/firewall-ipv6-3.conf diff --git a/test/pf/firewall.conf.orig b/test/pf/firewall.conf.orig index 7558d7183..d43de6146 100644 --- a/test/pf/firewall.conf.orig +++ b/test/pf/firewall.conf.orig @@ -50,7 +50,7 @@ rdr proto tcp from any to any port 80 -> 127.0.0.1 port 3128 # # Rule backup ssh access rule # backup ssh access rule -pass in quick inet proto tcp from 192.168.1.100 to port 22 flags S/SA modulate state label "RULE 9998 - ACCEPT" +pass in quick inet proto tcp from 192.168.1.100 to port 22 flags S/SA modulate state label "RULE -1 - ACCEPT" # # Rule 0 (eth1) block in log quick on eth1 inet from any to fragment label "RULE 0 - DROP" diff --git a/test/pf/firewall.fw.orig b/test/pf/firewall.fw.orig index c18a41bcb..21c05c2fa 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:34 2011 PST by vadim +# Generated Fri Mar 11 10:32:28 2011 PST by vadim # # files: * firewall.fw /etc/pf.fw # files: firewall.conf /etc/pf.conf @@ -173,7 +173,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Mar 10 21:08:34 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:28 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall1.conf.orig b/test/pf/firewall1.conf.orig index b15d4e962..e815aa909 100644 --- a/test/pf/firewall1.conf.orig +++ b/test/pf/firewall1.conf.orig @@ -18,11 +18,12 @@ scrub in all fragment reassemble -# Tables: (6) +# Tables: (7) 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 { 22.22.22.22 , 22.22.23.23 , 127.0.0.1 , 192.168.1.1 , 192.168.2.1 } 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 } @@ -167,7 +168,7 @@ pass quick inet from 192.168.1.0/24 to any keep state # Rule 18 (global) # firewall1:Policy:18: warning: Changing rule direction due to self reference -pass in quick inet proto tcp from any to port 3128 keep state +pass in quick inet proto tcp from any to port 3128 keep state # # Rule 19 (eth0) # rule from http://www.benzedrine.cx/transquid.html diff --git a/test/pf/firewall1.fw.orig b/test/pf/firewall1.fw.orig index 6e5b47bad..77c77cdad 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:38 2011 PST by vadim +# Generated Fri Mar 11 10:32:28 2011 PST by vadim # # files: * firewall1.fw /etc/fw/firewall1.fw # files: firewall1.conf /etc/fw/firewall1.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Mar 10 21:08:38 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:28 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 2e2464903..398d82c33 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:38 2011 PST by vadim +# Generated Fri Mar 11 10:32:30 2011 PST by vadim # # files: * firewall10-1.fw /etc/fw/firewall10-1.fw # files: firewall10-1.conf /etc/fw/firewall10-1.conf @@ -74,7 +74,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Mar 10 21:08:38 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:30 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 568ed930f..3a5754d9d 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:39 2011 PST by vadim +# Generated Fri Mar 11 10:32:31 2011 PST by vadim # # files: * firewall10-2.fw /etc/fw/firewall10-2.fw # files: firewall10-2.conf /etc/fw/firewall10-2.conf @@ -74,7 +74,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Mar 10 21:08:39 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:31 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 89de41880..3492ddd6b 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:39 2011 PST by vadim +# Generated Fri Mar 11 10:32:32 2011 PST by vadim # # files: * firewall10-3.fw /etc/fw/firewall10-3.fw # files: firewall10-3.conf /etc/fw/firewall10-3.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Mar 10 21:08:39 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:32 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 8693d5f60..bb35d3da8 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:40 2011 PST by vadim +# Generated Fri Mar 11 10:32:35 2011 PST by vadim # # files: * firewall10-4.fw /etc/fw/firewall10-4.fw # files: firewall10-4.conf /etc/fw/firewall10-4.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Mar 10 21:08:40 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:35 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 a434bb53a..9fa6b421e 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:40 2011 PST by vadim +# Generated Fri Mar 11 10:32:36 2011 PST by vadim # # files: * firewall10-5.fw /etc/fw/firewall10-5.fw # files: firewall10-5.conf /etc/fw/firewall10-5.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Mar 10 21:08:40 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:36 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 54ac5f274..113a11e9f 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:41 2011 PST by vadim +# Generated Fri Mar 11 10:32:37 2011 PST by vadim # # files: * firewall10-6.fw /etc/fw/firewall10-6.fw # files: firewall10-6.conf /etc/fw/firewall10-6.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Mar 10 21:08:41 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:37 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall100.conf.orig b/test/pf/firewall100.conf.orig index 12ee59094..ac8df8eec 100644 --- a/test/pf/firewall100.conf.orig +++ b/test/pf/firewall100.conf.orig @@ -9,12 +9,12 @@ match out all scrub (random-id min-ttl 1 max-mss 1460) # Tables: (1) -table { 10.1.1.81 , 10.3.14.81 } +table { 10.1.1.81 , 10.3.14.81 } # # Rule backup ssh access rule # backup ssh access rule -pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE 9998 -- ACCEPT " +pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE -1 -- ACCEPT " # # Rule 0 (global) block log quick inet from any to any no state label "RULE 0 -- DROP " diff --git a/test/pf/firewall100.fw.orig b/test/pf/firewall100.fw.orig index d2db70b8d..d6d7453fd 100755 --- a/test/pf/firewall100.fw.orig +++ b/test/pf/firewall100.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:41 2011 PST by vadim +# Generated Fri Mar 11 10:32:29 2011 PST by vadim # # files: * firewall100.fw /etc/fw/pf.fw # files: firewall100.conf /etc/fw/path\ with\ space/pf.conf @@ -167,7 +167,7 @@ configure_interfaces() { update_addresses_of_interface "em1 10.1.1.81/0xffffff00" "" } -log "Activating firewall script generated Thu Mar 10 21:08:41 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:29 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall101.conf.orig b/test/pf/firewall101.conf.orig index 12ee59094..ac8df8eec 100644 --- a/test/pf/firewall101.conf.orig +++ b/test/pf/firewall101.conf.orig @@ -9,12 +9,12 @@ match out all scrub (random-id min-ttl 1 max-mss 1460) # Tables: (1) -table { 10.1.1.81 , 10.3.14.81 } +table { 10.1.1.81 , 10.3.14.81 } # # Rule backup ssh access rule # backup ssh access rule -pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE 9998 -- ACCEPT " +pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE -1 -- ACCEPT " # # Rule 0 (global) block log quick inet from any to any no state label "RULE 0 -- DROP " diff --git a/test/pf/firewall101.fw.orig b/test/pf/firewall101.fw.orig index e7173b1c2..9b3163d7e 100755 --- a/test/pf/firewall101.fw.orig +++ b/test/pf/firewall101.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:42 2011 PST by vadim +# Generated Fri Mar 11 10:32:30 2011 PST by vadim # # files: * firewall101.fw /etc/fw/pf.fw # files: firewall101.conf /etc/fw/path\ with\ space/pf.conf @@ -170,7 +170,7 @@ configure_interfaces() { update_addresses_of_interface "em1 10.1.1.81/0xffffff00" "" } -log "Activating firewall script generated Thu Mar 10 21:08:42 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:30 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall102.conf.orig b/test/pf/firewall102.conf.orig index 12ee59094..ac8df8eec 100644 --- a/test/pf/firewall102.conf.orig +++ b/test/pf/firewall102.conf.orig @@ -9,12 +9,12 @@ match out all scrub (random-id min-ttl 1 max-mss 1460) # Tables: (1) -table { 10.1.1.81 , 10.3.14.81 } +table { 10.1.1.81 , 10.3.14.81 } # # Rule backup ssh access rule # backup ssh access rule -pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE 9998 -- ACCEPT " +pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE -1 -- ACCEPT " # # Rule 0 (global) block log quick inet from any to any no state label "RULE 0 -- DROP " diff --git a/test/pf/firewall102.fw.orig b/test/pf/firewall102.fw.orig index 3665d4791..37e6ffc53 100755 --- a/test/pf/firewall102.fw.orig +++ b/test/pf/firewall102.fw.orig @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:42 2011 PST by vadim +# Generated Fri Mar 11 10:32:31 2011 PST by vadim # # files: * firewall102.fw /etc/fw/pf.fw # files: firewall102.conf /etc/fw/path\ with\ space/pf.conf diff --git a/test/pf/firewall103-1.conf.orig b/test/pf/firewall103-1.conf.orig index ec943e9de..6635011fc 100644 --- a/test/pf/firewall103-1.conf.orig +++ b/test/pf/firewall103-1.conf.orig @@ -9,12 +9,12 @@ match out all scrub (random-id min-ttl 1 max-mss 1460) # Tables: (1) -table { 10.1.1.81 , 10.3.14.81 , 192.168.1.1 } +table { 10.1.1.81 , 10.3.14.81 , 192.168.1.1 } # # Rule backup ssh access rule # backup ssh access rule -pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE 9998 -- ACCEPT " +pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE -1 -- ACCEPT " # # Rule 0 (global) block log quick inet from any to any no state label "RULE 0 -- DROP " diff --git a/test/pf/firewall103-1.fw.orig b/test/pf/firewall103-1.fw.orig index f3a5ce31c..c751a544b 100755 --- a/test/pf/firewall103-1.fw.orig +++ b/test/pf/firewall103-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:43 2011 PST by vadim +# Generated Fri Mar 11 10:32:33 2011 PST by vadim # # files: * firewall103-1.fw /etc/fw/pf.fw # files: firewall103-1.conf /etc/fw/path\ with\ space/pf.conf @@ -394,7 +394,7 @@ configure_interfaces() { update_addresses_of_interface "bridge0 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Thu Mar 10 21:08:43 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:33 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall103-2.conf.orig b/test/pf/firewall103-2.conf.orig index d1fabd88f..dbaea8222 100644 --- a/test/pf/firewall103-2.conf.orig +++ b/test/pf/firewall103-2.conf.orig @@ -9,12 +9,12 @@ scrub out all random-id min-ttl 1 max-mss 1460 # Tables: (1) -table { 10.1.1.81 , 10.3.14.81 , 192.168.1.1 } +table { 10.1.1.81 , 10.3.14.81 , 192.168.1.1 } # # Rule backup ssh access rule # backup ssh access rule -pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE 9998 -- ACCEPT " +pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE -1 -- ACCEPT " # # Rule 0 (global) block log quick inet from any to any no state label "RULE 0 -- DROP " diff --git a/test/pf/firewall103-2.fw.orig b/test/pf/firewall103-2.fw.orig index 16fb7d02a..121474fb6 100755 --- a/test/pf/firewall103-2.fw.orig +++ b/test/pf/firewall103-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:45 2011 PST by vadim +# Generated Fri Mar 11 10:32:33 2011 PST by vadim # # files: * firewall103-2.fw /etc/fw/pf.fw # files: firewall103-2.conf /etc/fw/path\ with\ space/pf.conf @@ -394,7 +394,7 @@ configure_interfaces() { update_addresses_of_interface "bridge0 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Thu Mar 10 21:08:45 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:33 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall103.conf.orig b/test/pf/firewall103.conf.orig index ec943e9de..6635011fc 100644 --- a/test/pf/firewall103.conf.orig +++ b/test/pf/firewall103.conf.orig @@ -9,12 +9,12 @@ match out all scrub (random-id min-ttl 1 max-mss 1460) # Tables: (1) -table { 10.1.1.81 , 10.3.14.81 , 192.168.1.1 } +table { 10.1.1.81 , 10.3.14.81 , 192.168.1.1 } # # Rule backup ssh access rule # backup ssh access rule -pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE 9998 -- ACCEPT " +pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE -1 -- ACCEPT " # # Rule 0 (global) block log quick inet from any to any no state label "RULE 0 -- DROP " diff --git a/test/pf/firewall103.fw.orig b/test/pf/firewall103.fw.orig index a21263908..c7602c2ab 100755 --- a/test/pf/firewall103.fw.orig +++ b/test/pf/firewall103.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:43 2011 PST by vadim +# Generated Fri Mar 11 10:32:32 2011 PST by vadim # # files: * firewall103.fw /etc/fw/pf.fw # files: firewall103.conf /etc/fw/path\ with\ space/pf.conf @@ -397,7 +397,7 @@ configure_interfaces() { update_addresses_of_interface "bridge0 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Thu Mar 10 21:08:43 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:32 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall104-1.conf.orig b/test/pf/firewall104-1.conf.orig index 87ab28d20..8c25d7aa5 100644 --- a/test/pf/firewall104-1.conf.orig +++ b/test/pf/firewall104-1.conf.orig @@ -9,12 +9,12 @@ match out all scrub (random-id min-ttl 1 max-mss 1460) # Tables: (1) -table { bridge0 , 10.1.1.81 , 10.3.14.81 } +table { bridge0 , 10.1.1.81 , 10.3.14.81 } # # Rule backup ssh access rule # backup ssh access rule -pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE 9998 -- ACCEPT " +pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE -1 -- ACCEPT " # # Rule 0 (global) block log quick inet from any to any no state label "RULE 0 -- DROP " diff --git a/test/pf/firewall104-1.fw.orig b/test/pf/firewall104-1.fw.orig index 83dd19f37..f10ac6fdb 100755 --- a/test/pf/firewall104-1.fw.orig +++ b/test/pf/firewall104-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:46 2011 PST by vadim +# Generated Fri Mar 11 10:32:35 2011 PST by vadim # # files: * firewall104-1.fw /etc/fw/pf.fw # files: firewall104-1.conf /etc/fw/path\ with\ space/pf.conf @@ -393,7 +393,7 @@ configure_interfaces() { $IFCONFIG bridge0 -stp em3 } -log "Activating firewall script generated Thu Mar 10 21:08:46 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:35 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall104.conf.orig b/test/pf/firewall104.conf.orig index 87ab28d20..8c25d7aa5 100644 --- a/test/pf/firewall104.conf.orig +++ b/test/pf/firewall104.conf.orig @@ -9,12 +9,12 @@ match out all scrub (random-id min-ttl 1 max-mss 1460) # Tables: (1) -table { bridge0 , 10.1.1.81 , 10.3.14.81 } +table { bridge0 , 10.1.1.81 , 10.3.14.81 } # # Rule backup ssh access rule # backup ssh access rule -pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE 9998 -- ACCEPT " +pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE -1 -- ACCEPT " # # Rule 0 (global) block log quick inet from any to any no state label "RULE 0 -- DROP " diff --git a/test/pf/firewall104.fw.orig b/test/pf/firewall104.fw.orig index 1e94c3bd6..8b585ebf4 100755 --- a/test/pf/firewall104.fw.orig +++ b/test/pf/firewall104.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:45 2011 PST by vadim +# Generated Fri Mar 11 10:32:34 2011 PST by vadim # # files: * firewall104.fw /etc/fw/pf.fw # files: firewall104.conf /etc/fw/path\ with\ space/pf.conf @@ -396,7 +396,7 @@ configure_interfaces() { $IFCONFIG bridge0 stp em3 } -log "Activating firewall script generated Thu Mar 10 21:08:45 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:34 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall105.conf.orig b/test/pf/firewall105.conf.orig index ec943e9de..6635011fc 100644 --- a/test/pf/firewall105.conf.orig +++ b/test/pf/firewall105.conf.orig @@ -9,12 +9,12 @@ match out all scrub (random-id min-ttl 1 max-mss 1460) # Tables: (1) -table { 10.1.1.81 , 10.3.14.81 , 192.168.1.1 } +table { 10.1.1.81 , 10.3.14.81 , 192.168.1.1 } # # Rule backup ssh access rule # backup ssh access rule -pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE 9998 -- ACCEPT " +pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE -1 -- ACCEPT " # # Rule 0 (global) block log quick inet from any to any no state label "RULE 0 -- DROP " diff --git a/test/pf/firewall105.fw.orig b/test/pf/firewall105.fw.orig index 873521dbe..bcbd7315f 100755 --- a/test/pf/firewall105.fw.orig +++ b/test/pf/firewall105.fw.orig @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:46 2011 PST by vadim +# Generated Fri Mar 11 10:32:36 2011 PST by vadim # # files: * firewall105.fw /etc/fw/pf.fw # files: firewall105.conf /etc/fw/path\ with\ space/pf.conf diff --git a/test/pf/firewall106.conf.orig b/test/pf/firewall106.conf.orig index 87ab28d20..8c25d7aa5 100644 --- a/test/pf/firewall106.conf.orig +++ b/test/pf/firewall106.conf.orig @@ -9,12 +9,12 @@ match out all scrub (random-id min-ttl 1 max-mss 1460) # Tables: (1) -table { bridge0 , 10.1.1.81 , 10.3.14.81 } +table { bridge0 , 10.1.1.81 , 10.3.14.81 } # # Rule backup ssh access rule # backup ssh access rule -pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE 9998 -- ACCEPT " +pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE -1 -- ACCEPT " # # Rule 0 (global) block log quick inet from any to any no state label "RULE 0 -- DROP " diff --git a/test/pf/firewall106.fw.orig b/test/pf/firewall106.fw.orig index f5f42dea3..3183aebf7 100755 --- a/test/pf/firewall106.fw.orig +++ b/test/pf/firewall106.fw.orig @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:47 2011 PST by vadim +# Generated Fri Mar 11 10:32:37 2011 PST by vadim # # files: * firewall106.fw /etc/fw/pf.fw # files: firewall106.conf /etc/fw/path\ with\ space/pf.conf diff --git a/test/pf/firewall107.conf.orig b/test/pf/firewall107.conf.orig index 4375ccdcc..4c2afd3cb 100644 --- a/test/pf/firewall107.conf.orig +++ b/test/pf/firewall107.conf.orig @@ -9,12 +9,12 @@ match out all scrub (random-id min-ttl 1 max-mss 1460) # Tables: (1) -table { 10.1.1.81 , 10.3.14.81 , 192.168.101.1 , 192.168.102.1 } +table { 10.1.1.81 , 10.3.14.81 , 192.168.101.1 , 192.168.102.1 } # # Rule backup ssh access rule # backup ssh access rule -pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE 9998 -- ACCEPT " +pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE -1 -- ACCEPT " # # Rule 0 (global) block log quick inet from any to any no state label "RULE 0 -- DROP " diff --git a/test/pf/firewall107.fw.orig b/test/pf/firewall107.fw.orig index 0998badf1..efa8c621e 100755 --- a/test/pf/firewall107.fw.orig +++ b/test/pf/firewall107.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:47 2011 PST by vadim +# Generated Fri Mar 11 10:32:38 2011 PST by vadim # # files: * firewall107.fw /etc/fw/pf.fw # files: firewall107.conf /etc/fw/path\ with\ space/pf.conf @@ -395,7 +395,7 @@ configure_interfaces() { update_addresses_of_interface "vlan102 192.168.102.1/0xffffff00" "" } -log "Activating firewall script generated Thu Mar 10 21:08:47 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:38 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall108.conf.orig b/test/pf/firewall108.conf.orig index 4375ccdcc..4c2afd3cb 100644 --- a/test/pf/firewall108.conf.orig +++ b/test/pf/firewall108.conf.orig @@ -9,12 +9,12 @@ match out all scrub (random-id min-ttl 1 max-mss 1460) # Tables: (1) -table { 10.1.1.81 , 10.3.14.81 , 192.168.101.1 , 192.168.102.1 } +table { 10.1.1.81 , 10.3.14.81 , 192.168.101.1 , 192.168.102.1 } # # Rule backup ssh access rule # backup ssh access rule -pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE 9998 -- ACCEPT " +pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE -1 -- ACCEPT " # # Rule 0 (global) block log quick inet from any to any no state label "RULE 0 -- DROP " diff --git a/test/pf/firewall108.fw.orig b/test/pf/firewall108.fw.orig index 4ec7ea276..764330f6e 100755 --- a/test/pf/firewall108.fw.orig +++ b/test/pf/firewall108.fw.orig @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:48 2011 PST by vadim +# Generated Fri Mar 11 10:32:38 2011 PST by vadim # # files: * firewall108.fw /etc/fw/pf.fw # files: firewall108.conf /etc/fw/path\ with\ space/pf.conf diff --git a/test/pf/firewall109-1.conf.orig b/test/pf/firewall109-1.conf.orig index e574e9585..3354274f7 100644 --- a/test/pf/firewall109-1.conf.orig +++ b/test/pf/firewall109-1.conf.orig @@ -9,12 +9,12 @@ match out all scrub (random-id min-ttl 1 max-mss 1460) # Tables: (1) -table { 10.3.14.81 , 192.168.1.1 , 192.168.101.1 , 192.168.102.1 } +table { 10.3.14.81 , 192.168.1.1 , 192.168.101.1 , 192.168.102.1 } # # Rule backup ssh access rule # backup ssh access rule -pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE 9998 -- ACCEPT " +pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE -1 -- ACCEPT " # # Rule 0 (global) block log quick inet from any to any no state label "RULE 0 -- DROP " diff --git a/test/pf/firewall109-1.fw.orig b/test/pf/firewall109-1.fw.orig index 033251f25..f64a4cd23 100755 --- a/test/pf/firewall109-1.fw.orig +++ b/test/pf/firewall109-1.fw.orig @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:49 2011 PST by vadim +# Generated Fri Mar 11 10:32:40 2011 PST by vadim # # files: * firewall109-1.fw /etc/fw/pf.fw # files: firewall109-1.conf /etc/fw/path\ with\ space/pf.conf diff --git a/test/pf/firewall109-2.conf.orig b/test/pf/firewall109-2.conf.orig index cd6cd238b..f2903793e 100644 --- a/test/pf/firewall109-2.conf.orig +++ b/test/pf/firewall109-2.conf.orig @@ -9,12 +9,12 @@ match out all scrub (random-id min-ttl 1 max-mss 1460) # Tables: (1) -table { 10.3.14.81 , 192.168.1.1 } +table { 10.3.14.81 , 192.168.1.1 } # # Rule backup ssh access rule # backup ssh access rule -pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE 9998 -- ACCEPT " +pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE -1 -- ACCEPT " # # Rule 0 (global) block log quick inet from any to any no state label "RULE 0 -- DROP " diff --git a/test/pf/firewall109-2.fw.orig b/test/pf/firewall109-2.fw.orig index b34f8c5d0..7334f5257 100755 --- a/test/pf/firewall109-2.fw.orig +++ b/test/pf/firewall109-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:49 2011 PST by vadim +# Generated Fri Mar 11 10:32:40 2011 PST by vadim # # files: * firewall109-2.fw /etc/fw/pf.fw # files: firewall109-2.conf /etc/fw/path\ with\ space/pf.conf @@ -400,7 +400,7 @@ configure_interfaces() { update_addresses_of_interface "bridge0 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Thu Mar 10 21:08:49 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:40 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall109-3.conf.orig b/test/pf/firewall109-3.conf.orig index cd6cd238b..f2903793e 100644 --- a/test/pf/firewall109-3.conf.orig +++ b/test/pf/firewall109-3.conf.orig @@ -9,12 +9,12 @@ match out all scrub (random-id min-ttl 1 max-mss 1460) # Tables: (1) -table { 10.3.14.81 , 192.168.1.1 } +table { 10.3.14.81 , 192.168.1.1 } # # Rule backup ssh access rule # backup ssh access rule -pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE 9998 -- ACCEPT " +pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE -1 -- ACCEPT " # # Rule 0 (global) block log quick inet from any to any no state label "RULE 0 -- DROP " diff --git a/test/pf/firewall109-3.fw.orig b/test/pf/firewall109-3.fw.orig index 434c36972..4535b8e4c 100755 --- a/test/pf/firewall109-3.fw.orig +++ b/test/pf/firewall109-3.fw.orig @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:50 2011 PST by vadim +# Generated Fri Mar 11 10:32:41 2011 PST by vadim # # files: * firewall109-3.fw /etc/fw/pf.fw # files: firewall109-3.conf /etc/fw/path\ with\ space/pf.conf diff --git a/test/pf/firewall109.conf.orig b/test/pf/firewall109.conf.orig index e574e9585..3354274f7 100644 --- a/test/pf/firewall109.conf.orig +++ b/test/pf/firewall109.conf.orig @@ -9,12 +9,12 @@ match out all scrub (random-id min-ttl 1 max-mss 1460) # Tables: (1) -table { 10.3.14.81 , 192.168.1.1 , 192.168.101.1 , 192.168.102.1 } +table { 10.3.14.81 , 192.168.1.1 , 192.168.101.1 , 192.168.102.1 } # # Rule backup ssh access rule # backup ssh access rule -pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE 9998 -- ACCEPT " +pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE -1 -- ACCEPT " # # Rule 0 (global) block log quick inet from any to any no state label "RULE 0 -- DROP " diff --git a/test/pf/firewall109.fw.orig b/test/pf/firewall109.fw.orig index 717e27914..baae3a06a 100755 --- a/test/pf/firewall109.fw.orig +++ b/test/pf/firewall109.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:48 2011 PST by vadim +# Generated Fri Mar 11 10:32:39 2011 PST by vadim # # files: * firewall109.fw /etc/fw/pf.fw # files: firewall109.conf /etc/fw/path\ with\ space/pf.conf @@ -401,7 +401,7 @@ configure_interfaces() { update_addresses_of_interface "bridge0 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Thu Mar 10 21:08:48 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:39 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall11.fw.orig b/test/pf/firewall11.fw.orig index 011b42516..3dcc14b54 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:50 2011 PST by vadim +# Generated Fri Mar 11 10:32:41 2011 PST by vadim # # files: * firewall11.fw /etc/firewall11.fw # files: firewall11.conf /etc/firewall11.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Mar 10 21:08:50 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:41 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall110.fw.orig b/test/pf/firewall110.fw.orig index 96c32b353..716196b64 100755 --- a/test/pf/firewall110.fw.orig +++ b/test/pf/firewall110.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:51 2011 PST by vadim +# Generated Fri Mar 11 10:32:42 2011 PST by vadim # # files: * firewall110.fw /etc/fw/firewall110.fw # files: firewall110.conf /etc/fw/firewall110.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Mar 10 21:08:51 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:42 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall12.fw.orig b/test/pf/firewall12.fw.orig index 15c420d7a..f43ede0a2 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:51 2011 PST by vadim +# Generated Fri Mar 11 10:32:42 2011 PST by vadim # # files: * firewall12.fw /etc/fw/firewall12.fw # files: firewall12.conf /etc/fw/firewall12.conf @@ -165,7 +165,7 @@ configure_interfaces() { update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Mar 10 21:08:51 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:42 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall13.fw.orig b/test/pf/firewall13.fw.orig index 611bd1815..443e954b8 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:52 2011 PST by vadim +# Generated Fri Mar 11 10:32:43 2011 PST by vadim # # files: * firewall13.fw /etc/fw/firewall13.fw # files: firewall13.conf /etc/fw/firewall13.conf @@ -88,7 +88,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Mar 10 21:08:52 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:43 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall14-1.conf.orig b/test/pf/firewall14-1.conf.orig index 28a9cbb5e..ec61f0175 100644 --- a/test/pf/firewall14-1.conf.orig +++ b/test/pf/firewall14-1.conf.orig @@ -8,12 +8,12 @@ match out all scrub (random-id min-ttl 64 max-mss 1460) # Tables: (1) -table { 10.1.1.50 , 10.3.14.50 , 10.100.101.1 , 10.100.103.1 } +table { 10.1.1.50 , 10.3.14.50 , 10.100.101.1 , 10.100.103.1 } # # Rule backup ssh access rule # backup ssh access rule -pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE 9998 -- ACCEPT " +pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE -1 -- ACCEPT " # # Rule 0 (global) block log quick inet from any to any no state label "RULE 0 -- DROP " diff --git a/test/pf/firewall14-1.fw.orig b/test/pf/firewall14-1.fw.orig index 01e133733..1a5bb274d 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:53 2011 PST by vadim +# Generated Fri Mar 11 10:32:44 2011 PST by vadim # # files: * firewall14-1.fw /etc/firewall14-1.fw # files: firewall14-1.conf /etc/firewall14-1.conf @@ -248,7 +248,7 @@ configure_interfaces() { update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" "" } -log "Activating firewall script generated Thu Mar 10 21:08:53 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:44 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall14.conf.orig b/test/pf/firewall14.conf.orig index 519d99379..328eb5870 100644 --- a/test/pf/firewall14.conf.orig +++ b/test/pf/firewall14.conf.orig @@ -8,12 +8,12 @@ scrub out all random-id min-ttl 64 max-mss 1460 # Tables: (1) -table { 10.1.1.50 , 10.3.14.50 , 10.100.101.1 , 10.100.103.1 } +table { 10.1.1.50 , 10.3.14.50 , 10.100.101.1 , 10.100.103.1 } # # Rule backup ssh access rule # backup ssh access rule -pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE 9998 -- ACCEPT " +pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE -1 -- ACCEPT " # # Rule 0 (global) block log quick inet from any to any no state label "RULE 0 -- DROP " diff --git a/test/pf/firewall14.fw.orig b/test/pf/firewall14.fw.orig index b5554fbfe..73106fb4e 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:52 2011 PST by vadim +# Generated Fri Mar 11 10:32:43 2011 PST by vadim # # files: * firewall14.fw /etc/firewall14.fw # files: firewall14.conf /etc/firewall14.conf @@ -248,7 +248,7 @@ configure_interfaces() { update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" "" } -log "Activating firewall script generated Thu Mar 10 21:08:52 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:43 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall2-1.conf.orig b/test/pf/firewall2-1.conf.orig index 9dcca5ef2..e1d4698a7 100644 --- a/test/pf/firewall2-1.conf.orig +++ b/test/pf/firewall2-1.conf.orig @@ -24,7 +24,7 @@ scrub out all random-id min-ttl 32 max-mss 1460 # Tables: (2) table { 22.22.22.22 , 192.168.1.1 } -table { 22.22.22.22 , 192.168.1.1 , 192.168.2.1 } +table { 22.22.22.22 , 192.168.1.1 , 192.168.2.1 } # NAT compiler errors and warnings: # firewall2-1:NAT:1: error: Negation in original service is not supported. @@ -68,7 +68,7 @@ rdr-anchor "NAT" proto tcp from 192.168.1.0/24 to any port 1080 # # Rule backup ssh access rule # backup ssh access rule -pass in quick inet proto tcp from 192.168.1.100 to port 22 keep state label "RULE 9998 - ACCEPT **" +pass in quick inet proto tcp from 192.168.1.100 to port 22 keep state label "RULE -1 - ACCEPT **" # # Rule 0 (global) # 'catch all' rule diff --git a/test/pf/firewall2-1.fw.orig b/test/pf/firewall2-1.fw.orig index bf2ae087d..3574f642c 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:54 2011 PST by vadim +# Generated Fri Mar 11 10:32:46 2011 PST by vadim # # files: * firewall2-1.fw /etc/fw/firewall2-1.fw # files: firewall2-1.conf /etc/fw/firewall2-1.conf @@ -88,7 +88,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Mar 10 21:08:54 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:46 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall2-6.fw.orig b/test/pf/firewall2-6.fw.orig index 87dd61302..80035d3cc 100755 --- a/test/pf/firewall2-6.fw.orig +++ b/test/pf/firewall2-6.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:55 2011 PST by vadim +# Generated Fri Mar 11 10:32:47 2011 PST by vadim # # files: * firewall2-6.fw /etc/firewall2-6.fw # files: firewall2-6.conf /etc/firewall2-6.conf @@ -170,7 +170,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Mar 10 21:08:55 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:47 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall2.conf.orig b/test/pf/firewall2.conf.orig index 5fd064f72..7874f02ef 100644 --- a/test/pf/firewall2.conf.orig +++ b/test/pf/firewall2.conf.orig @@ -22,8 +22,9 @@ scrub in all fragment reassemble no-df scrub out all random-id min-ttl 32 max-mss 1460 -# Tables: (4) +# Tables: (5) table { 192.168.1.10 , 192.168.1.20 } +table { 22.22.22.22 , 22.22.23.23 , 127.0.0.1 , 192.168.1.1 , 192.168.2.1 } table { 22.22.22.22 , 22.22.23.23 , 192.168.1.1 , 192.168.2.1 } table { 192.168.1.0/24 , 192.168.2.0/24 } table { 22.22.22.22 , 22.22.23.23 , 192.168.1.0/24 , 192.168.1.1 , 192.168.2.1 } @@ -151,7 +152,7 @@ nat on eth1 proto udp from 192.168.1.0/24 to any -> 22.22.22.22 # # Rule backup ssh access rule # backup ssh access rule -pass in quick inet proto tcp from 192.168.1.100 to port 22 keep state label "RULE 9998 - ACCEPT **" +pass in quick inet proto tcp from 192.168.1.100 to port 22 keep state label "RULE -1 - ACCEPT **" # # Rule 0 (eth0) block in log quick on eth0 inet from ! 192.168.1.0/24 to any label "RULE 0 - DROP **" @@ -204,7 +205,7 @@ pass quick inet from 192.168.1.0/24 to any keep state label "RULE 10 - ACCEP # Rule 12 (global) # firewall2:Policy:12: warning: Changing rule direction due to self reference -pass in quick inet proto tcp from any to port { 21, 80, 25 } keep state label "RULE 12 - ACCEPT **" +pass in quick inet proto tcp from any to port { 21, 80, 25 } keep state label "RULE 12 - ACCEPT **" pass quick inet proto tcp from any to 192.168.1.10 port { 21, 80, 25 } keep state label "RULE 12 - ACCEPT **" # # Rule 13 (global) diff --git a/test/pf/firewall2.fw.orig b/test/pf/firewall2.fw.orig index 8118985de..0a79e9d0b 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:54 2011 PST by vadim +# Generated Fri Mar 11 10:32:44 2011 PST by vadim # # files: * firewall2.fw /etc/fw/firewall2.fw # files: firewall2.conf /etc/fw/firewall2.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Mar 10 21:08:54 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:44 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall20.fw.orig b/test/pf/firewall20.fw.orig index a54b343c4..6fffa87a8 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:56 2011 PST by vadim +# Generated Fri Mar 11 10:32:45 2011 PST by vadim # # files: * firewall20.fw /etc/fw/firewall20.fw # files: firewall20.conf /etc/fw/firewall20.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Mar 10 21:08:56 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:45 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall21.fw.orig b/test/pf/firewall21.fw.orig index 99526442d..0142efb53 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:56 2011 PST by vadim +# Generated Fri Mar 11 10:32:46 2011 PST by vadim # # files: * firewall21.fw /etc/fw/firewall21.fw # files: firewall21.conf /etc/fw/firewall21.conf @@ -81,7 +81,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Mar 10 21:08:56 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:46 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall22.fw.orig b/test/pf/firewall22.fw.orig index 1318ed557..820f06a59 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:57 2011 PST by vadim +# Generated Fri Mar 11 10:32:47 2011 PST by vadim # # files: * firewall22.fw /etc/fw/firewall22.fw # files: firewall22.conf /etc/fw/firewall22.conf @@ -80,7 +80,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Mar 10 21:08:57 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:47 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall3.fw.orig b/test/pf/firewall3.fw.orig index 91a0be199..c39decd21 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:57 2011 PST by vadim +# Generated Fri Mar 11 10:32:48 2011 PST by vadim # # files: * firewall3.fw /etc/firewall3.fw # files: firewall3.conf /etc/firewall3.conf @@ -165,7 +165,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Mar 10 21:08:57 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:48 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall33.fw.orig b/test/pf/firewall33.fw.orig index 772f1d042..481b4837d 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:59 2011 PST by vadim +# Generated Fri Mar 11 10:32:48 2011 PST by vadim # # files: * firewall33.fw /etc/fw/firewall33.fw # files: firewall33.conf /etc/fw/firewall33.conf @@ -168,7 +168,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Mar 10 21:08:59 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:48 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall34.fw.orig b/test/pf/firewall34.fw.orig index 08e17a0c8..11c94101e 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:58 2011 PST by vadim +# Generated Fri Mar 11 10:32:49 2011 PST by vadim # # files: * firewall34.fw /etc/fw/firewall34.fw # files: firewall34.conf /etc/fw/firewall34.conf @@ -164,7 +164,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Mar 10 21:08:58 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:49 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall38.fw.orig b/test/pf/firewall38.fw.orig index bc6296767..832401194 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:08:59 2011 PST by vadim +# Generated Fri Mar 11 10:32:49 2011 PST by vadim # # files: * firewall38.fw /etc/fw/firewall38.fw # files: firewall38.conf /etc/fw/firewall38.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Mar 10 21:08:59 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:49 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall39.fw.orig b/test/pf/firewall39.fw.orig index 796254046..a36b572ca 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:09:00 2011 PST by vadim +# Generated Fri Mar 11 10:32:50 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 Thu Mar 10 21:09:00 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:50 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall4.fw.orig b/test/pf/firewall4.fw.orig index 6b23d00f6..f48c69c59 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:09:00 2011 PST by vadim +# Generated Fri Mar 11 10:32:51 2011 PST by vadim # # files: * firewall4.fw pf.fw # files: firewall4.conf /etc/fw/pf.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Mar 10 21:09:00 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:51 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 bad90f11d..0064acc71 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:09:02 2011 PST by vadim +# Generated Fri Mar 11 10:32:52 2011 PST by vadim # # files: * firewall40-1.fw /etc/firewall40-1.fw # files: firewall40-1.conf /etc/firewall40-1.conf @@ -182,7 +182,7 @@ configure_interfaces() { update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Mar 10 21:09:02 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:52 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall40.fw.orig b/test/pf/firewall40.fw.orig index 39cd2fc6e..3d72e9792 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:09:01 2011 PST by vadim +# Generated Fri Mar 11 10:32:52 2011 PST by vadim # # files: * firewall40.fw /etc/firewall40.fw # files: firewall40.conf /etc/firewall40.conf @@ -166,7 +166,7 @@ configure_interfaces() { update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Mar 10 21:09:01 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:52 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall41.fw.orig b/test/pf/firewall41.fw.orig index 792851c22..2945c5baf 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:09:02 2011 PST by vadim +# Generated Fri Mar 11 10:32:53 2011 PST by vadim # # files: * firewall41.fw /etc/firewall41.fw # files: firewall41.conf /etc/firewall41.conf @@ -169,7 +169,7 @@ configure_interfaces() { update_addresses_of_interface "eth1 2.2.2.2/0xffffff00" "" } -log "Activating firewall script generated Thu Mar 10 21:09:02 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:53 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall5.fw.orig b/test/pf/firewall5.fw.orig index 09104656b..51e583207 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:09:03 2011 PST by vadim +# Generated Fri Mar 11 10:32:53 2011 PST by vadim # # files: * firewall5.fw /etc/fw/firewall5.fw # files: firewall5.conf /etc/fw/firewall5.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Mar 10 21:09:03 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:53 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall51.fw.orig b/test/pf/firewall51.fw.orig index a8889d121..109b4209b 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:09:04 2011 PST by vadim +# Generated Fri Mar 11 10:32:54 2011 PST by vadim # # files: * firewall51.fw /etc/fw/firewall51.fw # files: firewall51.conf /etc/fw/firewall51.conf @@ -80,7 +80,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Mar 10 21:09:04 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:54 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall6.fw.orig b/test/pf/firewall6.fw.orig index 51fb4a37a..fe393bd56 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:09:04 2011 PST by vadim +# Generated Fri Mar 11 10:32:54 2011 PST by vadim # # files: * firewall6.fw /etc/fw/firewall6.fw # files: firewall6.conf /etc/fw/firewall6.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Mar 10 21:09:04 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:54 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall62.fw.orig b/test/pf/firewall62.fw.orig index c66507db1..022535ab4 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:09:05 2011 PST by vadim +# Generated Fri Mar 11 10:32:55 2011 PST by vadim # # files: * firewall62.fw /etc/firewall62.fw # files: firewall62.conf /etc/firewall62.conf @@ -191,7 +191,7 @@ configure_interfaces() { update_addresses_of_interface "en1 222.222.222.222/0xffffff00" "" } -log "Activating firewall script generated Thu Mar 10 21:09:05 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:55 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall63.fw.orig b/test/pf/firewall63.fw.orig index 2b6382606..65ee036d8 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:09:05 2011 PST by vadim +# Generated Fri Mar 11 10:32:55 2011 PST by vadim # # files: * firewall63.fw /etc/fw/firewall63.fw # files: firewall63.conf /etc/fw/firewall63.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Mar 10 21:09:05 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:55 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall7.fw.orig b/test/pf/firewall7.fw.orig index efc0f23f3..26345ce0f 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:09:06 2011 PST by vadim +# Generated Fri Mar 11 10:32:56 2011 PST by vadim # # files: * firewall7.fw /etc/fw/firewall7.fw # files: firewall7.conf /etc/fw/firewall7.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Mar 10 21:09:06 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:56 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall70.fw.orig b/test/pf/firewall70.fw.orig index cc89bf9be..d519408a0 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:09:06 2011 PST by vadim +# Generated Fri Mar 11 10:32:57 2011 PST by vadim # # files: * firewall70.fw /etc/fw/firewall70.fw # files: firewall70.conf /etc/fw/firewall70.conf @@ -82,7 +82,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Mar 10 21:09:06 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:57 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall8.fw.orig b/test/pf/firewall8.fw.orig index 313d5dfef..76a2b8661 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:09:07 2011 PST by vadim +# Generated Fri Mar 11 10:32:57 2011 PST by vadim # # files: * firewall8.fw /etc/firewall8.fw # files: firewall8.conf /etc/firewall8.conf @@ -72,7 +72,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Mar 10 21:09:07 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:57 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 edc9ee40e..bf35a7f00 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:09:08 2011 PST by vadim +# Generated Fri Mar 11 10:32:59 2011 PST by vadim # # files: * firewall80-4.5.fw /etc/firewall80-4.5.fw # files: firewall80-4.5.conf /etc/firewall80-4.5.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Mar 10 21:09:08 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:59 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall80.fw.orig b/test/pf/firewall80.fw.orig index c61637af5..f79751a61 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:09:07 2011 PST by vadim +# Generated Fri Mar 11 10:32:58 2011 PST by vadim # # files: * firewall80.fw /etc/firewall80.fw # files: firewall80.conf /etc/firewall80.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Mar 10 21:09:07 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:58 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall9.fw.orig b/test/pf/firewall9.fw.orig index 88a772bb4..9a6141719 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:09:08 2011 PST by vadim +# Generated Fri Mar 11 10:32:59 2011 PST by vadim # # files: * firewall9.fw /etc/fw/firewall9.fw # files: firewall9.conf /etc/fw/firewall9.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Mar 10 21:09:08 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:32:59 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall91.conf.orig b/test/pf/firewall91.conf.orig index d175664ab..562f6ee2f 100644 --- a/test/pf/firewall91.conf.orig +++ b/test/pf/firewall91.conf.orig @@ -3,12 +3,12 @@ # Tables: (1) -table { 10.1.1.50 , 10.3.14.50 , 10.100.101.1 , 10.100.103.1 } +table { 10.1.1.50 , 10.3.14.50 , 10.100.101.1 , 10.100.103.1 } # # Rule backup ssh access rule # backup ssh access rule -pass in quick inet proto tcp from 10.3.14.30 to port 22 flags S/SA keep state label "RULE 9998 -- ACCEPT " +pass in quick inet proto tcp from 10.3.14.30 to port 22 flags S/SA keep state label "RULE -1 -- ACCEPT " # # Rule 0 (global) block log quick inet from any to any label "RULE 0 -- DROP " diff --git a/test/pf/firewall91.fw.orig b/test/pf/firewall91.fw.orig index fa61ac195..598822aec 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:09:09 2011 PST by vadim +# Generated Fri Mar 11 10:33:00 2011 PST by vadim # # files: * firewall91.fw /etc/fw/pf.fw # files: firewall91.conf /etc/fw/pf.conf @@ -247,7 +247,7 @@ configure_interfaces() { update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" "" } -log "Activating firewall script generated Thu Mar 10 21:09:09 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:33:00 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall92.conf.orig b/test/pf/firewall92.conf.orig index 10605080e..a0b55c9fd 100644 --- a/test/pf/firewall92.conf.orig +++ b/test/pf/firewall92.conf.orig @@ -9,7 +9,7 @@ match out all scrub (random-id min-ttl 1 max-mss 1460) # Tables: (1) -table { 10.1.1.81 , 10.3.14.81 } +table { 10.1.1.81 , 10.3.14.81 } # NAT compiler errors and warnings: # firewall92:NAT:2: error: No translation rules are not supported for PF 4.7, use negation to implement exclusions @@ -28,12 +28,12 @@ match in on em0 proto udp from any to 10.3.14.81 port 161 rdr-to 10.1.1.1 port 1 # # Rule backup ssh access rule # backup ssh access rule -pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE 9998 -- ACCEPT " +pass in quick inet proto tcp from 10.3.14.30 to port 22 label "RULE -1 -- ACCEPT " # # Rule 0 (global) # firewall92:Policy:0: warning: Changing rule direction due to self reference -pass in quick inet proto tcp from 10.3.14.0/24 to port 22 label "RULE 0 -- ACCEPT " +pass in quick inet proto tcp from 10.3.14.0/24 to port 22 label "RULE 0 -- ACCEPT " # # Rule 1 (global) pass quick inet from 10.1.1.0/24 to any label "RULE 1 -- ACCEPT " diff --git a/test/pf/firewall92.fw.orig b/test/pf/firewall92.fw.orig index 2e9ff0912..4a1cda97f 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:09:09 2011 PST by vadim +# Generated Fri Mar 11 10:33:00 2011 PST by vadim # # files: * firewall92.fw /etc/fw/pf.fw # files: firewall92.conf /etc/fw/path\ with\ space/pf.conf @@ -166,7 +166,7 @@ configure_interfaces() { update_addresses_of_interface "em1 10.1.1.81/0xffffff00" "" } -log "Activating firewall script generated Thu Mar 10 21:09:09 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:33:00 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_1_openbsd-1.fw.orig b/test/pf/pf_cluster_1_openbsd-1.fw.orig index 6a6131215..512c5185c 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:09:10 2011 PST by vadim +# Generated Fri Mar 11 10:33:03 2011 PST by vadim # # files: * pf_cluster_1_openbsd-1.fw /etc/pf_cluster_1_openbsd-1.fw # files: pf_cluster_1_openbsd-1.conf /etc/pf_cluster_1_openbsd-1.conf @@ -299,7 +299,7 @@ configure_interfaces() { update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Thu Mar 10 21:09:10 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:33:03 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 0391cc641..4944597ec 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:09:10 2011 PST by vadim +# Generated Fri Mar 11 10:33:03 2011 PST by vadim # # files: * pf_cluster_1_openbsd-2.fw /etc/pf_cluster_1_openbsd-2.fw # files: pf_cluster_1_openbsd-2.conf /etc/pf_cluster_1_openbsd-2.conf @@ -195,7 +195,7 @@ configure_interfaces() { update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Thu Mar 10 21:09:10 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:33:03 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_2_freebsd-1.fw.orig b/test/pf/pf_cluster_2_freebsd-1.fw.orig index ba28866bc..209473be5 100755 --- a/test/pf/pf_cluster_2_freebsd-1.fw.orig +++ b/test/pf/pf_cluster_2_freebsd-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:09:10 2011 PST by vadim +# Generated Fri Mar 11 10:33:03 2011 PST by vadim # # files: * pf_cluster_2_freebsd-1.fw /etc/pf_cluster_2_freebsd-1.fw # files: pf_cluster_2_freebsd-1.conf /etc/pf_cluster_2_freebsd-1.conf @@ -301,7 +301,7 @@ configure_interfaces() { update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Thu Mar 10 21:09:10 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:33:03 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 32a95eac4..265049e72 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:09:10 2011 PST by vadim +# Generated Fri Mar 11 10:33:03 2011 PST by vadim # # files: * pf_cluster_2_freebsd-2.fw /etc/pf_cluster_2_freebsd-2.fw # files: pf_cluster_2_freebsd-2.conf /etc/pf_cluster_2_freebsd-2.conf @@ -197,7 +197,7 @@ configure_interfaces() { update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Thu Mar 10 21:09:10 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:33:03 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 1d9711ed1..fefe7f9ad 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:09:10 2011 PST by vadim +# Generated Fri Mar 11 10:33:03 2011 PST by vadim # # files: * pf_cluster_3_openbsd-3.fw /etc/pf_cluster_3_openbsd-3.fw # files: pf_cluster_3_openbsd-3.conf /etc/pf_cluster_3_openbsd-3.conf @@ -302,7 +302,7 @@ configure_interfaces() { update_addresses_of_interface "carp2 172.20.0.1/0xffffff00" "" } -log "Activating firewall script generated Thu Mar 10 21:09:10 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:33:03 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 87bb9655b..f74be0d7f 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.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:09:10 2011 PST by vadim +# Generated Fri Mar 11 10:33:03 2011 PST by vadim # # files: * pf_cluster_3_openbsd-4.fw /etc/pf_cluster_3_openbsd-4.fw # files: pf_cluster_3_openbsd-4.conf /etc/pf_cluster_3_openbsd-4.conf @@ -199,7 +199,7 @@ configure_interfaces() { update_addresses_of_interface "carp2 172.20.0.1/0xffffff00" "" } -log "Activating firewall script generated Thu Mar 10 21:09:10 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:33:03 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_4_rc.conf.local b/test/pf/pf_cluster_4_rc.conf.local index 096c5ca0e..0df521df5 100755 --- a/test/pf/pf_cluster_4_rc.conf.local +++ b/test/pf/pf_cluster_4_rc.conf.local @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:09:10 2011 PST by vadim +# Generated Fri Mar 11 10:33:03 2011 PST by vadim # # files: * pf_cluster_4_rc.conf.local /etc/pf_cluster_4_rc.conf.local # files: pf_cluster_4_pf.conf /etc/pf_cluster_4_pf.conf diff --git a/test/pf/pf_cluster_5_openbsd-3.fw.orig b/test/pf/pf_cluster_5_openbsd-3.fw.orig index b2e17f888..a7b79d985 100755 --- a/test/pf/pf_cluster_5_openbsd-3.fw.orig +++ b/test/pf/pf_cluster_5_openbsd-3.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:09:11 2011 PST by vadim +# Generated Fri Mar 11 10:33:04 2011 PST by vadim # # files: * pf_cluster_5_openbsd-3.fw /etc/pf_cluster_5_openbsd-3.fw # files: pf_cluster_5_openbsd-3.conf /etc/pf_cluster_5_openbsd-3.conf @@ -302,7 +302,7 @@ configure_interfaces() { update_addresses_of_interface "carp2 172.20.0.1/0xffffff00" "" } -log "Activating firewall script generated Thu Mar 10 21:09:11 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:33:04 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_5_openbsd-4.fw.orig b/test/pf/pf_cluster_5_openbsd-4.fw.orig index fc8952238..eb1c150d2 100755 --- a/test/pf/pf_cluster_5_openbsd-4.fw.orig +++ b/test/pf/pf_cluster_5_openbsd-4.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3496 +# Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Thu Mar 10 21:09:11 2011 PST by vadim +# Generated Fri Mar 11 10:33:04 2011 PST by vadim # # files: * pf_cluster_5_openbsd-4.fw /etc/pf_cluster_5_openbsd-4.fw # files: pf_cluster_5_openbsd-4.conf /etc/pf_cluster_5_openbsd-4.conf @@ -199,7 +199,7 @@ configure_interfaces() { update_addresses_of_interface "carp2 172.20.0.1/0xffffff00" "" } -log "Activating firewall script generated Thu Mar 10 21:09:11 2011 by vadim" +log "Activating firewall script generated Fri Mar 11 10:33:04 2011 by vadim" set_kernel_vars configure_interfaces