From 8b158c0a748d01ff84abdff2d70db53df6f96502 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Wed, 16 Feb 2011 16:23:54 -0800 Subject: [PATCH] * OSConfigurator_bsd_interfaces.cpp (configureInterfaces): make sure we print "ifconfig" commands for mtu and other parameters for all interfaces, including those with no ip addresses and bridge ports (unnumbered interfaces used to be skipped before) --- doc/ChangeLog | 11 ++++++++- src/pflib/OSConfigurator_bsd_interfaces.cpp | 27 +++++++++++++++++---- test/pf/firewall-base-rulesets.fw.orig | 4 +-- test/pf/firewall-ipv6-1.fw.orig | 4 +-- test/pf/firewall-ipv6-2.fw.orig | 4 +-- test/pf/firewall-ipv6-3.fw.orig | 2 +- test/pf/firewall.fw.orig | 4 +-- test/pf/firewall1.fw.orig | 4 +-- test/pf/firewall10-1.fw.orig | 4 +-- test/pf/firewall10-2.fw.orig | 4 +-- test/pf/firewall10-3.fw.orig | 4 +-- test/pf/firewall10-4.fw.orig | 4 +-- test/pf/firewall10-5.fw.orig | 4 +-- test/pf/firewall10-6.fw.orig | 4 +-- test/pf/firewall100.fw.orig | 4 +-- test/pf/firewall101.fw.orig | 4 +-- test/pf/firewall102.fw.orig | 2 +- test/pf/firewall103-1.fw.orig | 4 +-- test/pf/firewall103-2.fw.orig | 4 +-- test/pf/firewall103.fw.orig | 4 +-- test/pf/firewall104-1.fw.orig | 4 +-- test/pf/firewall104.fw.orig | 4 +-- test/pf/firewall105.fw.orig | 2 +- test/pf/firewall106.fw.orig | 2 +- test/pf/firewall107.fw.orig | 4 +-- test/pf/firewall108.fw.orig | 2 +- test/pf/firewall109-1.fw.orig | 2 +- test/pf/firewall109-2.fw.orig | 4 +-- test/pf/firewall109-3.fw.orig | 2 +- test/pf/firewall109.fw.orig | 8 +++--- test/pf/firewall11.fw.orig | 4 +-- test/pf/firewall110.fw.orig | 4 +-- test/pf/firewall12.fw.orig | 4 +-- test/pf/firewall13.fw.orig | 4 +-- test/pf/firewall14-1.fw.orig | 4 +-- test/pf/firewall14.fw.orig | 4 +-- test/pf/firewall2-1.fw.orig | 4 +-- test/pf/firewall2.fw.orig | 4 +-- test/pf/firewall20.fw.orig | 4 +-- test/pf/firewall21.fw.orig | 4 +-- test/pf/firewall22.fw.orig | 4 +-- test/pf/firewall3.fw.orig | 6 ++--- test/pf/firewall33.fw.orig | 4 +-- test/pf/firewall34.fw.orig | 4 +-- test/pf/firewall38.fw.orig | 4 +-- test/pf/firewall39.fw.orig | 4 +-- test/pf/firewall4.fw.orig | 4 +-- test/pf/firewall40-1.fw.orig | 4 +-- test/pf/firewall40.fw.orig | 4 +-- test/pf/firewall41.fw.orig | 4 +-- test/pf/firewall5.fw.orig | 4 +-- test/pf/firewall51.fw.orig | 4 +-- test/pf/firewall6.fw.orig | 4 +-- test/pf/firewall62.fw.orig | 4 +-- test/pf/firewall63.fw.orig | 4 +-- test/pf/firewall7.fw.orig | 4 +-- test/pf/firewall70.fw.orig | 4 +-- test/pf/firewall8.fw.orig | 4 +-- test/pf/firewall80-4.5.fw.orig | 4 +-- test/pf/firewall80.fw.orig | 4 +-- test/pf/firewall9.fw.orig | 4 +-- test/pf/firewall91.fw.orig | 4 +-- test/pf/firewall92.fw.orig | 4 +-- test/pf/objects-for-regression-tests.fwb | 6 ++--- test/pf/pf_cluster_1_openbsd-1.fw.orig | 4 +-- test/pf/pf_cluster_1_openbsd-2.fw.orig | 4 +-- test/pf/pf_cluster_2_freebsd-1.fw.orig | 4 +-- test/pf/pf_cluster_2_freebsd-2.fw.orig | 4 +-- test/pf/pf_cluster_3_openbsd-3.fw.orig | 4 +-- test/pf/pf_cluster_3_openbsd-4.fw.orig | 4 +-- test/pf/pf_cluster_4_rc.conf.local | 2 +- 71 files changed, 166 insertions(+), 140 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 32dbe8249..24f6f9257 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,10 @@ 2011-02-16 vadim + * OSConfigurator_bsd_interfaces.cpp (configureInterfaces): make + sure we print "ifconfig" commands for mtu and other parameters for + all interfaces, including those with no ip addresses and bridge + ports (unnumbered interfaces used to be skipped before) + * ObjectTreeView.cpp (startDrag): fixes #2099 "Object list scrolls up to the last edited object". Object tree used to scroll spontaneously when user started dragging an object from it to a @@ -33,7 +38,11 @@ vlan interface name and turns off automatic configuration of interface type and vlan ID. These checks sometimes were in the way of building complex configurations that involved multiple vlan - interfaces with names not matching their IDs. + interfaces with names not matching their IDs. This also fixes SF + bug #3066714 "please dont stop me from creating a new interface" + where user wanted to create interface "veth201.0" on Linux but the + GUI blocked this operation because the name seemed to match vlan + interface pattern. 2011-02-15 vadim diff --git a/src/pflib/OSConfigurator_bsd_interfaces.cpp b/src/pflib/OSConfigurator_bsd_interfaces.cpp index 56061d7b3..e53a2730d 100644 --- a/src/pflib/OSConfigurator_bsd_interfaces.cpp +++ b/src/pflib/OSConfigurator_bsd_interfaces.cpp @@ -313,7 +313,14 @@ string OSConfigurator_bsd::configureInterfaces() { interfaceConfigLineIP(interfaces_by_name[iface_name], all_addresses[iface_name]); - interfaceIfconfigLine(interfaces_by_name[iface_name]); + } + + for (list::iterator i=all_interfaces.begin(); + i != all_interfaces.end(); ++i ) + { + Interface *iface = Interface::cast(*i); + assert(iface); + interfaceIfconfigLine(iface); } } @@ -367,6 +374,13 @@ void OSConfigurator_bsd::interfaceIfconfigLine(Interface *iface) interface_configuration_lines[iface_name] << config_lines; } +/* + * If user configured mtu and free-form ifconfig options in the GUI, + * add ifconfig command to execute them. + * + * TODO: Add a checkbox "up" in interface dialog, it should be on by + * default. + */ QString OSConfigurator_bsd::interfaceIfconfigLineInternal(Interface *iface, Configlet *configlet) { @@ -393,12 +407,15 @@ QString OSConfigurator_bsd::interfaceIfconfigLineInternal(Interface *iface, configlet->setVariable("mtu", ""); } + QString options; + if (!ifopt->getStr("iface_options").empty()) { - configlet->setVariable("options", ifopt->getStr("iface_options").c_str()); - need_additional_ifconfig =true; - } else - configlet->setVariable("options", ""); + options = ifopt->getStr("iface_options").c_str(); + need_additional_ifconfig = true; + } + + configlet->setVariable("options", options.simplified()); if (need_additional_ifconfig) return configlet->expand(); diff --git a/test/pf/firewall-base-rulesets.fw.orig b/test/pf/firewall-base-rulesets.fw.orig index 4e7908b2a..20b36c05a 100755 --- a/test/pf/firewall-base-rulesets.fw.orig +++ b/test/pf/firewall-base-rulesets.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:50 2011 PST by vadim +# Generated Wed Feb 16 16:18:52 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 @@ -163,7 +163,7 @@ configure_interfaces() { update_addresses_of_interface "en2 192.168.100.1/0xffffff00" "" } -log "Activating firewall script generated Wed Feb 16 15:16:50 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:52 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 69952dcd1..fef34ce9d 100755 --- a/test/pf/firewall-ipv6-1.fw.orig +++ b/test/pf/firewall-ipv6-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:50 2011 PST by vadim +# Generated Wed Feb 16 16:18:53 2011 PST by vadim # # files: * firewall-ipv6-1.fw pf-ipv6.fw # files: firewall-ipv6-1.conf /etc/fw/pf-ipv6.conf @@ -175,7 +175,7 @@ configure_interfaces() { update_addresses_of_interface "lo ::1/128 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Wed Feb 16 15:16:50 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:53 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 1cfb38084..3caa6c5fb 100755 --- a/test/pf/firewall-ipv6-2.fw.orig +++ b/test/pf/firewall-ipv6-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:51 2011 PST by vadim +# Generated Wed Feb 16 16:18:55 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 Wed Feb 16 15:16:51 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:55 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 69de7ff0b..2508c2fdf 100755 --- a/test/pf/firewall-ipv6-3.fw.orig +++ b/test/pf/firewall-ipv6-3.fw.orig @@ -3,7 +3,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:51 2011 PST by vadim +# Generated Wed Feb 16 16:18:56 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.fw.orig b/test/pf/firewall.fw.orig index ca0fdc445..23ec3eb62 100755 --- a/test/pf/firewall.fw.orig +++ b/test/pf/firewall.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:16 2011 PST by vadim +# Generated Wed Feb 16 16:17:49 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 Wed Feb 16 15:16:16 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:17:49 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall1.fw.orig b/test/pf/firewall1.fw.orig index c872605e7..f1091b637 100755 --- a/test/pf/firewall1.fw.orig +++ b/test/pf/firewall1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:16 2011 PST by vadim +# Generated Wed Feb 16 16:17:51 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 Wed Feb 16 15:16:16 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:17:51 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 46918ec46..f0e662b68 100755 --- a/test/pf/firewall10-1.fw.orig +++ b/test/pf/firewall10-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:18 2011 PST by vadim +# Generated Wed Feb 16 16:17:54 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 Wed Feb 16 15:16:18 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:17:54 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 6425a7ba7..08ebaac10 100755 --- a/test/pf/firewall10-2.fw.orig +++ b/test/pf/firewall10-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:19 2011 PST by vadim +# Generated Wed Feb 16 16:17:56 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 Wed Feb 16 15:16:19 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:17:56 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 58dc1a3ca..13379709a 100755 --- a/test/pf/firewall10-3.fw.orig +++ b/test/pf/firewall10-3.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:20 2011 PST by vadim +# Generated Wed Feb 16 16:17:58 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 Wed Feb 16 15:16:20 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:17:58 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 1a0629392..783c4f723 100755 --- a/test/pf/firewall10-4.fw.orig +++ b/test/pf/firewall10-4.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:23 2011 PST by vadim +# Generated Wed Feb 16 16:18:03 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 Wed Feb 16 15:16:23 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:03 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 be03cd9bc..e32fe0d85 100755 --- a/test/pf/firewall10-5.fw.orig +++ b/test/pf/firewall10-5.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:24 2011 PST by vadim +# Generated Wed Feb 16 16:18:06 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 Wed Feb 16 15:16:24 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:06 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 b92227e3f..51165532a 100755 --- a/test/pf/firewall10-6.fw.orig +++ b/test/pf/firewall10-6.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:26 2011 PST by vadim +# Generated Wed Feb 16 16:18:08 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 Wed Feb 16 15:16:26 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:08 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall100.fw.orig b/test/pf/firewall100.fw.orig index 79d5b169d..e446f590a 100755 --- a/test/pf/firewall100.fw.orig +++ b/test/pf/firewall100.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:17 2011 PST by vadim +# Generated Wed Feb 16 16:17:52 2011 PST by vadim # # files: * firewall100.fw /etc/fw/pf.fw # files: firewall100.conf /etc/fw/path\ with\ space/pf.conf @@ -161,7 +161,7 @@ configure_interfaces() { update_addresses_of_interface "em1 10.1.1.81/0xffffff00" "" } -log "Activating firewall script generated Wed Feb 16 15:16:17 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:17:52 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall101.fw.orig b/test/pf/firewall101.fw.orig index d8f1cb535..8ea92ab1c 100755 --- a/test/pf/firewall101.fw.orig +++ b/test/pf/firewall101.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:18 2011 PST by vadim +# Generated Wed Feb 16 16:17:53 2011 PST by vadim # # files: * firewall101.fw /etc/fw/pf.fw # files: firewall101.conf /etc/fw/path\ with\ space/pf.conf @@ -164,7 +164,7 @@ configure_interfaces() { update_addresses_of_interface "em1 10.1.1.81/0xffffff00" "" } -log "Activating firewall script generated Wed Feb 16 15:16:18 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:17:53 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall102.fw.orig b/test/pf/firewall102.fw.orig index 7732117e8..4cb1ddb50 100755 --- a/test/pf/firewall102.fw.orig +++ b/test/pf/firewall102.fw.orig @@ -3,7 +3,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:19 2011 PST by vadim +# Generated Wed Feb 16 16:17:55 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.fw.orig b/test/pf/firewall103-1.fw.orig index f4f348679..62f50a27c 100755 --- a/test/pf/firewall103-1.fw.orig +++ b/test/pf/firewall103-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:21 2011 PST by vadim +# Generated Wed Feb 16 16:17:59 2011 PST by vadim # # files: * firewall103-1.fw /etc/fw/pf.fw # files: firewall103-1.conf /etc/fw/path\ with\ space/pf.conf @@ -388,7 +388,7 @@ configure_interfaces() { update_addresses_of_interface "bridge0 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Wed Feb 16 15:16:21 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:17:59 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall103-2.fw.orig b/test/pf/firewall103-2.fw.orig index fe2a27795..58caf85f6 100755 --- a/test/pf/firewall103-2.fw.orig +++ b/test/pf/firewall103-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:21 2011 PST by vadim +# Generated Wed Feb 16 16:18:01 2011 PST by vadim # # files: * firewall103-2.fw /etc/fw/pf.fw # files: firewall103-2.conf /etc/fw/path\ with\ space/pf.conf @@ -388,7 +388,7 @@ configure_interfaces() { update_addresses_of_interface "bridge0 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Wed Feb 16 15:16:21 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:01 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall103.fw.orig b/test/pf/firewall103.fw.orig index 7d8c83380..fb097d71e 100755 --- a/test/pf/firewall103.fw.orig +++ b/test/pf/firewall103.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:20 2011 PST by vadim +# Generated Wed Feb 16 16:17:57 2011 PST by vadim # # files: * firewall103.fw /etc/fw/pf.fw # files: firewall103.conf /etc/fw/path\ with\ space/pf.conf @@ -391,7 +391,7 @@ configure_interfaces() { update_addresses_of_interface "bridge0 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Wed Feb 16 15:16:20 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:17:57 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall104-1.fw.orig b/test/pf/firewall104-1.fw.orig index 6f4280f85..1fb01f446 100755 --- a/test/pf/firewall104-1.fw.orig +++ b/test/pf/firewall104-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:23 2011 PST by vadim +# Generated Wed Feb 16 16:18:04 2011 PST by vadim # # files: * firewall104-1.fw /etc/fw/pf.fw # files: firewall104-1.conf /etc/fw/path\ with\ space/pf.conf @@ -387,7 +387,7 @@ configure_interfaces() { $IFCONFIG bridge0 -stp em3 } -log "Activating firewall script generated Wed Feb 16 15:16:23 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:04 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall104.fw.orig b/test/pf/firewall104.fw.orig index 113330cb8..36d83399f 100755 --- a/test/pf/firewall104.fw.orig +++ b/test/pf/firewall104.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:22 2011 PST by vadim +# Generated Wed Feb 16 16:18:02 2011 PST by vadim # # files: * firewall104.fw /etc/fw/pf.fw # files: firewall104.conf /etc/fw/path\ with\ space/pf.conf @@ -390,7 +390,7 @@ configure_interfaces() { $IFCONFIG bridge0 stp em3 } -log "Activating firewall script generated Wed Feb 16 15:16:22 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:02 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall105.fw.orig b/test/pf/firewall105.fw.orig index ab236ae88..744e5602b 100755 --- a/test/pf/firewall105.fw.orig +++ b/test/pf/firewall105.fw.orig @@ -3,7 +3,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:24 2011 PST by vadim +# Generated Wed Feb 16 16:18:05 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.fw.orig b/test/pf/firewall106.fw.orig index 0c6982d55..0a747d3b3 100755 --- a/test/pf/firewall106.fw.orig +++ b/test/pf/firewall106.fw.orig @@ -3,7 +3,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:25 2011 PST by vadim +# Generated Wed Feb 16 16:18:07 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.fw.orig b/test/pf/firewall107.fw.orig index fccd801c9..7247d7df0 100755 --- a/test/pf/firewall107.fw.orig +++ b/test/pf/firewall107.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:26 2011 PST by vadim +# Generated Wed Feb 16 16:18:09 2011 PST by vadim # # files: * firewall107.fw /etc/fw/pf.fw # files: firewall107.conf /etc/fw/path\ with\ space/pf.conf @@ -389,7 +389,7 @@ configure_interfaces() { update_addresses_of_interface "vlan102 192.168.102.1/0xffffff00" "" } -log "Activating firewall script generated Wed Feb 16 15:16:26 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:09 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall108.fw.orig b/test/pf/firewall108.fw.orig index ef648865d..05e3a4875 100755 --- a/test/pf/firewall108.fw.orig +++ b/test/pf/firewall108.fw.orig @@ -3,7 +3,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:27 2011 PST by vadim +# Generated Wed Feb 16 16:18:10 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.fw.orig b/test/pf/firewall109-1.fw.orig index a5f4da4b1..d861e1bbe 100755 --- a/test/pf/firewall109-1.fw.orig +++ b/test/pf/firewall109-1.fw.orig @@ -3,7 +3,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:28 2011 PST by vadim +# Generated Wed Feb 16 16:20:03 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.fw.orig b/test/pf/firewall109-2.fw.orig index 738a275ca..c49930300 100755 --- a/test/pf/firewall109-2.fw.orig +++ b/test/pf/firewall109-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:28 2011 PST by vadim +# Generated Wed Feb 16 16:18:13 2011 PST by vadim # # files: * firewall109-2.fw /etc/fw/pf.fw # files: firewall109-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 Wed Feb 16 15:16:28 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:13 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall109-3.fw.orig b/test/pf/firewall109-3.fw.orig index faba6a12a..3ef817293 100755 --- a/test/pf/firewall109-3.fw.orig +++ b/test/pf/firewall109-3.fw.orig @@ -3,7 +3,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:29 2011 PST by vadim +# Generated Wed Feb 16 16:18:15 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.fw.orig b/test/pf/firewall109.fw.orig index 13ff78c5d..0ede37a69 100755 --- a/test/pf/firewall109.fw.orig +++ b/test/pf/firewall109.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:27 2011 PST by vadim +# Generated Wed Feb 16 16:18:11 2011 PST by vadim # # files: * firewall109.fw /etc/fw/pf.fw # files: firewall109.conf /etc/fw/path\ with\ space/pf.conf @@ -383,10 +383,10 @@ configure_interfaces() { sync_pfsync_interfaces update_addresses_of_interface "em0 10.3.14.81/0xffffff00" "" update_addresses_of_interface "em1" "" - $IFCONFIG em1 media 100baseTX mediaopt full-duplex up + $IFCONFIG em1 media 100baseTX mediaopt full-duplex update_vlans_of_interface "em2 vlan101:101 vlan102:102" update_addresses_of_interface "em2" "" - $IFCONFIG em2 media 100baseTX mediaopt full-duplex up + $IFCONFIG em2 media 100baseTX mediaopt full-duplex update_addresses_of_interface "vlan101 192.168.101.1/0xffffff00" "" update_addresses_of_interface "vlan102 192.168.102.1/0xffffff00" "" update_bridge_interface bridge0 "em1 em2" @@ -395,7 +395,7 @@ configure_interfaces() { update_addresses_of_interface "bridge0 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Wed Feb 16 15:16:27 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:11 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall11.fw.orig b/test/pf/firewall11.fw.orig index f27204918..6abacfceb 100755 --- a/test/pf/firewall11.fw.orig +++ b/test/pf/firewall11.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:29 2011 PST by vadim +# Generated Wed Feb 16 16:18:16 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 Wed Feb 16 15:16:29 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:16 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall110.fw.orig b/test/pf/firewall110.fw.orig index 97f796c4f..ee7f17b9f 100755 --- a/test/pf/firewall110.fw.orig +++ b/test/pf/firewall110.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:30 2011 PST by vadim +# Generated Wed Feb 16 16:18:17 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 Wed Feb 16 15:16:30 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:17 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall12.fw.orig b/test/pf/firewall12.fw.orig index f2d13bf0e..77400957a 100755 --- a/test/pf/firewall12.fw.orig +++ b/test/pf/firewall12.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:31 2011 PST by vadim +# Generated Wed Feb 16 16:18:18 2011 PST by vadim # # files: * firewall12.fw /etc/fw/firewall12.fw # files: firewall12.conf /etc/fw/firewall12.conf @@ -159,7 +159,7 @@ configure_interfaces() { update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Wed Feb 16 15:16:31 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:18 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall13.fw.orig b/test/pf/firewall13.fw.orig index 3764824ac..725557bd1 100755 --- a/test/pf/firewall13.fw.orig +++ b/test/pf/firewall13.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:31 2011 PST by vadim +# Generated Wed Feb 16 16:18:19 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 Wed Feb 16 15:16:31 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:19 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 63cd9f333..d2aea8446 100755 --- a/test/pf/firewall14-1.fw.orig +++ b/test/pf/firewall14-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:33 2011 PST by vadim +# Generated Wed Feb 16 16:18:21 2011 PST by vadim # # files: * firewall14-1.fw /etc/firewall14-1.fw # files: firewall14-1.conf /etc/firewall14-1.conf @@ -242,7 +242,7 @@ configure_interfaces() { update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" "" } -log "Activating firewall script generated Wed Feb 16 15:16:33 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:21 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall14.fw.orig b/test/pf/firewall14.fw.orig index 3d4b4a96f..c3bb31f51 100755 --- a/test/pf/firewall14.fw.orig +++ b/test/pf/firewall14.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:32 2011 PST by vadim +# Generated Wed Feb 16 16:18:20 2011 PST by vadim # # files: * firewall14.fw /etc/firewall14.fw # files: firewall14.conf /etc/firewall14.conf @@ -242,7 +242,7 @@ configure_interfaces() { update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" "" } -log "Activating firewall script generated Wed Feb 16 15:16:32 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:20 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 309e98b17..7cd28d743 100755 --- a/test/pf/firewall2-1.fw.orig +++ b/test/pf/firewall2-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:35 2011 PST by vadim +# Generated Wed Feb 16 16:18:25 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 Wed Feb 16 15:16:35 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:25 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall2.fw.orig b/test/pf/firewall2.fw.orig index 5a58dce8b..dcac456e6 100755 --- a/test/pf/firewall2.fw.orig +++ b/test/pf/firewall2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:33 2011 PST by vadim +# Generated Wed Feb 16 16:18:22 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 Wed Feb 16 15:16:33 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:22 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall20.fw.orig b/test/pf/firewall20.fw.orig index a3bfe024a..9a6a42327 100755 --- a/test/pf/firewall20.fw.orig +++ b/test/pf/firewall20.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:34 2011 PST by vadim +# Generated Wed Feb 16 16:18:23 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 Wed Feb 16 15:16:34 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:23 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall21.fw.orig b/test/pf/firewall21.fw.orig index 01e12d28c..1fac845e7 100755 --- a/test/pf/firewall21.fw.orig +++ b/test/pf/firewall21.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:34 2011 PST by vadim +# Generated Wed Feb 16 16:18:24 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 Wed Feb 16 15:16:34 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:24 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall22.fw.orig b/test/pf/firewall22.fw.orig index 39fc2d20e..628558e56 100755 --- a/test/pf/firewall22.fw.orig +++ b/test/pf/firewall22.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:35 2011 PST by vadim +# Generated Wed Feb 16 16:18:26 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 Wed Feb 16 15:16:35 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:26 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall3.fw.orig b/test/pf/firewall3.fw.orig index f059cb50c..3feaeed72 100755 --- a/test/pf/firewall3.fw.orig +++ b/test/pf/firewall3.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:36 2011 PST by vadim +# Generated Wed Feb 16 16:18:27 2011 PST by vadim # # files: * firewall3.fw /etc/firewall3.fw # files: firewall3.conf /etc/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.0/0xffffff00 22.22.22.1/0xffffff00" "" + 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 "le1 192.168.1.1/0xffffff00" "" update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Wed Feb 16 15:16:36 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:27 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall33.fw.orig b/test/pf/firewall33.fw.orig index 186bb1cad..8032a6634 100755 --- a/test/pf/firewall33.fw.orig +++ b/test/pf/firewall33.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:37 2011 PST by vadim +# Generated Wed Feb 16 16:18:29 2011 PST by vadim # # files: * firewall33.fw /etc/fw/firewall33.fw # files: firewall33.conf /etc/fw/firewall33.conf @@ -162,7 +162,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Wed Feb 16 15:16:37 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:29 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall34.fw.orig b/test/pf/firewall34.fw.orig index 50e8dce91..1f0e94e87 100755 --- a/test/pf/firewall34.fw.orig +++ b/test/pf/firewall34.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:37 2011 PST by vadim +# Generated Wed Feb 16 16:18:30 2011 PST by vadim # # files: * firewall34.fw /etc/fw/firewall34.fw # files: firewall34.conf /etc/fw/firewall34.conf @@ -158,7 +158,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Wed Feb 16 15:16:37 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:30 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall38.fw.orig b/test/pf/firewall38.fw.orig index d712e2968..c3bcf1614 100755 --- a/test/pf/firewall38.fw.orig +++ b/test/pf/firewall38.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:38 2011 PST by vadim +# Generated Wed Feb 16 16:18:31 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 Wed Feb 16 15:16:38 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:31 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall39.fw.orig b/test/pf/firewall39.fw.orig index 3cc752bb5..f700bb231 100755 --- a/test/pf/firewall39.fw.orig +++ b/test/pf/firewall39.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:38 2011 PST by vadim +# Generated Wed Feb 16 16:18:32 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 Wed Feb 16 15:16:38 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:32 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall4.fw.orig b/test/pf/firewall4.fw.orig index 70ac96b76..d74f04a8c 100755 --- a/test/pf/firewall4.fw.orig +++ b/test/pf/firewall4.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:39 2011 PST by vadim +# Generated Wed Feb 16 16:18:33 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 Wed Feb 16 15:16:39 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:33 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 a53a85695..9fdf06a73 100755 --- a/test/pf/firewall40-1.fw.orig +++ b/test/pf/firewall40-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:40 2011 PST by vadim +# Generated Wed Feb 16 16:18:35 2011 PST by vadim # # files: * firewall40-1.fw /etc/firewall40-1.fw # files: firewall40-1.conf /etc/firewall40-1.conf @@ -176,7 +176,7 @@ configure_interfaces() { update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Wed Feb 16 15:16:40 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:35 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall40.fw.orig b/test/pf/firewall40.fw.orig index 4a8b0c1de..3c9d6d100 100755 --- a/test/pf/firewall40.fw.orig +++ b/test/pf/firewall40.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:39 2011 PST by vadim +# Generated Wed Feb 16 16:18:34 2011 PST by vadim # # files: * firewall40.fw /etc/firewall40.fw # files: firewall40.conf /etc/firewall40.conf @@ -160,7 +160,7 @@ configure_interfaces() { update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Wed Feb 16 15:16:39 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:34 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall41.fw.orig b/test/pf/firewall41.fw.orig index 0de4575c1..ec782965f 100755 --- a/test/pf/firewall41.fw.orig +++ b/test/pf/firewall41.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:41 2011 PST by vadim +# Generated Wed Feb 16 16:18:36 2011 PST by vadim # # files: * firewall41.fw /etc/firewall41.fw # files: firewall41.conf /etc/firewall41.conf @@ -163,7 +163,7 @@ configure_interfaces() { update_addresses_of_interface "eth1 2.2.2.2/0xffffff00" "" } -log "Activating firewall script generated Wed Feb 16 15:16:41 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:36 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall5.fw.orig b/test/pf/firewall5.fw.orig index 05578de29..0553b3c49 100755 --- a/test/pf/firewall5.fw.orig +++ b/test/pf/firewall5.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:41 2011 PST by vadim +# Generated Wed Feb 16 16:18:38 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 Wed Feb 16 15:16:41 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:38 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall51.fw.orig b/test/pf/firewall51.fw.orig index 8df0cd334..071b2cf7b 100755 --- a/test/pf/firewall51.fw.orig +++ b/test/pf/firewall51.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:42 2011 PST by vadim +# Generated Wed Feb 16 16:18:39 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 Wed Feb 16 15:16:42 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:39 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall6.fw.orig b/test/pf/firewall6.fw.orig index 78806cc60..acacdd9ec 100755 --- a/test/pf/firewall6.fw.orig +++ b/test/pf/firewall6.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:42 2011 PST by vadim +# Generated Wed Feb 16 16:18:40 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 Wed Feb 16 15:16:42 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:40 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall62.fw.orig b/test/pf/firewall62.fw.orig index 4d7402430..361479cf3 100755 --- a/test/pf/firewall62.fw.orig +++ b/test/pf/firewall62.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:43 2011 PST by vadim +# Generated Wed Feb 16 16:18:41 2011 PST by vadim # # files: * firewall62.fw /etc/firewall62.fw # files: firewall62.conf /etc/firewall62.conf @@ -185,7 +185,7 @@ configure_interfaces() { update_addresses_of_interface "en1 222.222.222.222/0xffffff00" "" } -log "Activating firewall script generated Wed Feb 16 15:16:43 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:41 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall63.fw.orig b/test/pf/firewall63.fw.orig index 7a271a938..b2b574595 100755 --- a/test/pf/firewall63.fw.orig +++ b/test/pf/firewall63.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:43 2011 PST by vadim +# Generated Wed Feb 16 16:18:42 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 Wed Feb 16 15:16:43 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:42 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall7.fw.orig b/test/pf/firewall7.fw.orig index b828ca8c9..dc275fd50 100755 --- a/test/pf/firewall7.fw.orig +++ b/test/pf/firewall7.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:44 2011 PST by vadim +# Generated Wed Feb 16 16:18:43 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 Wed Feb 16 15:16:44 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:43 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall70.fw.orig b/test/pf/firewall70.fw.orig index 476063a9b..24f4fca0c 100755 --- a/test/pf/firewall70.fw.orig +++ b/test/pf/firewall70.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:45 2011 PST by vadim +# Generated Wed Feb 16 16:18:44 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 Wed Feb 16 15:16:45 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:44 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall8.fw.orig b/test/pf/firewall8.fw.orig index d59640606..3a9a3ba2d 100755 --- a/test/pf/firewall8.fw.orig +++ b/test/pf/firewall8.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:46 2011 PST by vadim +# Generated Wed Feb 16 16:18:45 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 Wed Feb 16 15:16:46 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:45 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 e6a8a5e0b..72827478c 100755 --- a/test/pf/firewall80-4.5.fw.orig +++ b/test/pf/firewall80-4.5.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:47 2011 PST by vadim +# Generated Wed Feb 16 16:18:47 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 Wed Feb 16 15:16:47 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:47 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall80.fw.orig b/test/pf/firewall80.fw.orig index 1b74761ca..bbd71352a 100755 --- a/test/pf/firewall80.fw.orig +++ b/test/pf/firewall80.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:46 2011 PST by vadim +# Generated Wed Feb 16 16:18:46 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 Wed Feb 16 15:16:46 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:46 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall9.fw.orig b/test/pf/firewall9.fw.orig index 8ce913667..873f19a2b 100755 --- a/test/pf/firewall9.fw.orig +++ b/test/pf/firewall9.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:47 2011 PST by vadim +# Generated Wed Feb 16 16:18:49 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 Wed Feb 16 15:16:47 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:49 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall91.fw.orig b/test/pf/firewall91.fw.orig index d97089099..9dddf93d7 100755 --- a/test/pf/firewall91.fw.orig +++ b/test/pf/firewall91.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:48 2011 PST by vadim +# Generated Wed Feb 16 16:18:50 2011 PST by vadim # # files: * firewall91.fw /etc/fw/pf.fw # files: firewall91.conf /etc/fw/pf.conf @@ -241,7 +241,7 @@ configure_interfaces() { update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" "" } -log "Activating firewall script generated Wed Feb 16 15:16:48 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:50 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall92.fw.orig b/test/pf/firewall92.fw.orig index 206b24fef..91225c723 100755 --- a/test/pf/firewall92.fw.orig +++ b/test/pf/firewall92.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:48 2011 PST by vadim +# Generated Wed Feb 16 16:18:51 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 Wed Feb 16 15:16:48 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:51 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 23f15ee4e..780a491b0 100644 --- a/test/pf/objects-for-regression-tests.fwb +++ b/test/pf/objects-for-regression-tests.fwb @@ -22805,7 +22805,7 @@ - + @@ -22898,7 +22898,7 @@ - + @@ -22908,7 +22908,7 @@ - + diff --git a/test/pf/pf_cluster_1_openbsd-1.fw.orig b/test/pf/pf_cluster_1_openbsd-1.fw.orig index 4ccc139a4..be0b5c699 100755 --- a/test/pf/pf_cluster_1_openbsd-1.fw.orig +++ b/test/pf/pf_cluster_1_openbsd-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:51 2011 PST by vadim +# Generated Wed Feb 16 16:18:56 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 @@ -293,7 +293,7 @@ configure_interfaces() { update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Wed Feb 16 15:16:51 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:56 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 5a7c28e22..f740bffb0 100755 --- a/test/pf/pf_cluster_1_openbsd-2.fw.orig +++ b/test/pf/pf_cluster_1_openbsd-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:52 2011 PST by vadim +# Generated Wed Feb 16 16:18:56 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 @@ -189,7 +189,7 @@ configure_interfaces() { update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Wed Feb 16 15:16:52 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:56 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 dc7133f14..d397e4042 100755 --- a/test/pf/pf_cluster_2_freebsd-1.fw.orig +++ b/test/pf/pf_cluster_2_freebsd-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:52 2011 PST by vadim +# Generated Wed Feb 16 16:18:57 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 @@ -295,7 +295,7 @@ configure_interfaces() { update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Wed Feb 16 15:16:52 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:57 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 8775556d6..0ce001d9b 100755 --- a/test/pf/pf_cluster_2_freebsd-2.fw.orig +++ b/test/pf/pf_cluster_2_freebsd-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:52 2011 PST by vadim +# Generated Wed Feb 16 16:18:57 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 @@ -191,7 +191,7 @@ configure_interfaces() { update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Wed Feb 16 15:16:52 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:57 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 48b50e847..404b09916 100755 --- a/test/pf/pf_cluster_3_openbsd-3.fw.orig +++ b/test/pf/pf_cluster_3_openbsd-3.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:52 2011 PST by vadim +# Generated Wed Feb 16 16:18:57 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 @@ -296,7 +296,7 @@ configure_interfaces() { update_addresses_of_interface "carp2 172.20.0.1/0xffffff00" "" } -log "Activating firewall script generated Wed Feb 16 15:16:52 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:57 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 0559ad238..d0be0fa6f 100755 --- a/test/pf/pf_cluster_3_openbsd-4.fw.orig +++ b/test/pf/pf_cluster_3_openbsd-4.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:16:52 2011 PST by vadim +# Generated Wed Feb 16 16:18:57 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 @@ -193,7 +193,7 @@ configure_interfaces() { update_addresses_of_interface "carp2 172.20.0.1/0xffffff00" "" } -log "Activating firewall script generated Wed Feb 16 15:16:52 2011 by vadim" +log "Activating firewall script generated Wed Feb 16 16:18:57 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 0746f971f..7ed4ccada 100755 --- a/test/pf/pf_cluster_4_rc.conf.local +++ b/test/pf/pf_cluster_4_rc.conf.local @@ -3,7 +3,7 @@ # # Firewall Builder fwb_pf v4.2.0.3479 # -# Generated Wed Feb 16 15:46:54 2011 PST by vadim +# Generated Wed Feb 16 16:18:57 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