From 143594ddc7c7f5e9cc163ff1542fe3404ee2cf19 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Mon, 14 Feb 2011 10:44:04 -0800 Subject: [PATCH] see 2058 fixed mtu configuration commands generated for FreeBSD in shell script mode --- VERSION | 2 +- VERSION.h | 2 +- packaging/fwbuilder-static-qt.spec | 2 +- packaging/fwbuilder.control | 2 +- packaging/fwbuilder.spec | 2 +- src/pflib/OSConfigurator_bsd.h | 2 + src/pflib/OSConfigurator_bsd_interfaces.cpp | 34 +++++++++------ src/pflib/OSConfigurator_freebsd.cpp | 43 ++++--------------- src/res/configlets/freebsd/ifconfig_interface | 2 +- .../freebsd/rc_conf_ifconfig_interface | 9 ++++ 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 | 5 ++- test/pf/firewall101.fw.orig | 5 ++- test/pf/firewall102.fw.orig | 4 +- 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/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 | 4 +- 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 | 34 ++++++++++++--- 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 | 8 ++-- test/pf/pf_cluster_2_freebsd-2.fw.orig | 8 ++-- 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 | 6 +-- 75 files changed, 207 insertions(+), 187 deletions(-) create mode 100644 src/res/configlets/freebsd/rc_conf_ifconfig_interface diff --git a/VERSION b/VERSION index f53ffe1a3..bb87e02e8 100644 --- a/VERSION +++ b/VERSION @@ -7,7 +7,7 @@ FWB_MICRO_VERSION=0 # build number is like "nano" version number. I am incrementing build # number during development cycle # -BUILD_NUM="3474" +BUILD_NUM="3475" VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM" diff --git a/VERSION.h b/VERSION.h index b6dbb2881..8eb4b0bb7 100644 --- a/VERSION.h +++ b/VERSION.h @@ -1,2 +1,2 @@ -#define VERSION "4.2.0.3474" +#define VERSION "4.2.0.3475" #define GENERATION "4.2" diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec index 4ada2f45a..3e11e1ce9 100644 --- a/packaging/fwbuilder-static-qt.spec +++ b/packaging/fwbuilder-static-qt.spec @@ -3,7 +3,7 @@ %define name fwbuilder -%define version 4.2.0.3474 +%define version 4.2.0.3475 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control index 4fb0210a2..cf436b87e 100644 --- a/packaging/fwbuilder.control +++ b/packaging/fwbuilder.control @@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu Priority: extra Section: checkinstall Maintainer: vadim@fwbuilder.org -Version: 4.2.0.3474-1 +Version: 4.2.0.3475-1 Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15 Description: Firewall Builder GUI and policy compilers diff --git a/packaging/fwbuilder.spec b/packaging/fwbuilder.spec index 5afcb1a4b..3b4904cd6 100644 --- a/packaging/fwbuilder.spec +++ b/packaging/fwbuilder.spec @@ -1,6 +1,6 @@ %define name fwbuilder -%define version 4.2.0.3474 +%define version 4.2.0.3475 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/src/pflib/OSConfigurator_bsd.h b/src/pflib/OSConfigurator_bsd.h index c719fda48..678cacedc 100644 --- a/src/pflib/OSConfigurator_bsd.h +++ b/src/pflib/OSConfigurator_bsd.h @@ -99,6 +99,8 @@ protected: // this function generates additional ifconfig parameters virtual void interfaceIfconfigLine(libfwbuilder::Interface *iface); + virtual QString interfaceIfconfigLineInternal(libfwbuilder::Interface *iface, + Configlet *configlet); virtual QString printAllInterfaceConfigurationLines(); diff --git a/src/pflib/OSConfigurator_bsd_interfaces.cpp b/src/pflib/OSConfigurator_bsd_interfaces.cpp index 1048c4dc1..7ad028f39 100644 --- a/src/pflib/OSConfigurator_bsd_interfaces.cpp +++ b/src/pflib/OSConfigurator_bsd_interfaces.cpp @@ -360,12 +360,21 @@ string OSConfigurator_bsd::configureInterfaces() void OSConfigurator_bsd::interfaceIfconfigLine(Interface *iface) { QString iface_name = iface->getName().c_str(); - Configlet configlet(fw, "bsd", "ifconfig_interface"); - configlet.removeComments(); - configlet.collapseEmptyStrings(true); + QString config_lines = interfaceIfconfigLineInternal(iface, &configlet); + if (!config_lines.isEmpty()) + interface_configuration_lines[iface_name] << config_lines; +} - configlet.setVariable("interface_name", iface_name); +QString OSConfigurator_bsd::interfaceIfconfigLineInternal(Interface *iface, + Configlet *configlet) +{ + QString iface_name = iface->getName().c_str(); + + configlet->removeComments(); + configlet->collapseEmptyStrings(true); + + configlet->setVariable("interface_name", iface_name); FWOptions *ifopt = iface->getOptionsObject(); assert(ifopt != NULL); @@ -374,24 +383,25 @@ void OSConfigurator_bsd::interfaceIfconfigLine(Interface *iface) QStringList ifconfig_options; if (ifopt->getBool("iface_configure_mtu") && ifopt->getInt("iface_mtu") > 0) { - configlet.setVariable("have_mtu", true); - configlet.setVariable("mtu", ifopt->getInt("iface_mtu")); + configlet->setVariable("have_mtu", true); + configlet->setVariable("mtu", ifopt->getInt("iface_mtu")); need_additional_ifconfig = true; } else { - configlet.setVariable("have_mtu", false); - configlet.setVariable("mtu", ""); + configlet->setVariable("have_mtu", false); + configlet->setVariable("mtu", ""); } if (!ifopt->getStr("iface_options").empty()) { - configlet.setVariable("options", ifopt->getStr("iface_options").c_str()); + configlet->setVariable("options", ifopt->getStr("iface_options").c_str()); need_additional_ifconfig =true; } else - configlet.setVariable("options", ""); + configlet->setVariable("options", ""); - if (need_additional_ifconfig) - interface_configuration_lines[iface_name] << configlet.expand(); + if (need_additional_ifconfig) return configlet->expand(); + + return ""; } void OSConfigurator_bsd::summaryConfigLineIP(QStringList , bool ) diff --git a/src/pflib/OSConfigurator_freebsd.cpp b/src/pflib/OSConfigurator_freebsd.cpp index 08cff9177..731c5640f 100644 --- a/src/pflib/OSConfigurator_freebsd.cpp +++ b/src/pflib/OSConfigurator_freebsd.cpp @@ -201,44 +201,19 @@ void OSConfigurator_freebsd::interfaceConfigLineIP( void OSConfigurator_freebsd::interfaceIfconfigLine(Interface *iface) { QString iface_name = iface->getName().c_str(); - - Configlet configlet(fw, "freebsd", "ifconfig_interface"); - configlet.removeComments(); - configlet.collapseEmptyStrings(true); - - configlet.setVariable("interface_name", iface_name); - - FWOptions *ifopt = iface->getOptionsObject(); - assert(ifopt != NULL); - - bool need_additional_ifconfig = false; - QStringList ifconfig_options; - if (ifopt->getBool("iface_configure_mtu") && ifopt->getInt("iface_mtu") > 0) + FWOptions* options = fw->getOptionsObject(); + if (options->getBool("generate_rc_conf_file")) { - configlet.setVariable("have_mtu", true); - configlet.setVariable("mtu", ifopt->getInt("iface_mtu")); - need_additional_ifconfig = true; + Configlet configlet(fw, "freebsd", "rc_conf_ifconfig_interface"); + QString config_lines = interfaceIfconfigLineInternal(iface, &configlet); + if (!config_lines.isEmpty()) ifconfig_lines[iface_name] << config_lines; } else { - configlet.setVariable("have_mtu", false); - configlet.setVariable("mtu", ""); + Configlet configlet(fw, "freebsd", "ifconfig_interface"); + QString config_lines = interfaceIfconfigLineInternal(iface, &configlet); + if (!config_lines.isEmpty()) + interface_configuration_lines[iface_name] << config_lines; } - - if (!ifopt->getStr("iface_options").empty()) - { - configlet.setVariable("options", ifopt->getStr("iface_options").c_str()); - need_additional_ifconfig =true; - } else - configlet.setVariable("options", ""); - - // unlike in virtual function in the parent class - // OSConfigurator_bsd, here we add generated strings to - // ifconfig_lines that will be used to compose - // "ifconfig_" variable later in - // printAllInterfaceConfigurationLines() - - if (need_additional_ifconfig) - ifconfig_lines[iface_name] << configlet.expand(); } void OSConfigurator_freebsd::summaryConfigLineVlan(QStringList vlan_names) diff --git a/src/res/configlets/freebsd/ifconfig_interface b/src/res/configlets/freebsd/ifconfig_interface index b9b4969ec..1f81f3798 100644 --- a/src/res/configlets/freebsd/ifconfig_interface +++ b/src/res/configlets/freebsd/ifconfig_interface @@ -5,5 +5,5 @@ ## using single "#", these will appear in the script. ## -{{if have_mtu}}mtu {{$mtu}}{{endif}} {{$options}} +$IFCONFIG {{$interface_name}} {{if have_mtu}}mtu {{$mtu}}{{endif}} {{$options}} diff --git a/src/res/configlets/freebsd/rc_conf_ifconfig_interface b/src/res/configlets/freebsd/rc_conf_ifconfig_interface new file mode 100644 index 000000000..b9b4969ec --- /dev/null +++ b/src/res/configlets/freebsd/rc_conf_ifconfig_interface @@ -0,0 +1,9 @@ +## -*- mode: shell-script; -*- +## +## Lines that start with "##" will be removed before this code is +## added to the generated script. Regular shell comments can be added +## using single "#", these will appear in the script. +## + +{{if have_mtu}}mtu {{$mtu}}{{endif}} {{$options}} + diff --git a/test/pf/firewall-base-rulesets.fw.orig b/test/pf/firewall-base-rulesets.fw.orig index b31500bb6..2490b449c 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.3474 # -# Generated Sun Feb 13 18:01:27 2011 PST by vadim +# Generated Sun Feb 13 22:28:14 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 Sun Feb 13 18:01:27 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:14 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 6915e91a5..a6395832a 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.3474 # -# Generated Sun Feb 13 18:01:27 2011 PST by vadim +# Generated Sun Feb 13 22:28:14 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 Sun Feb 13 18:01:27 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:14 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 021fd0204..212fe8fd5 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.3474 # -# Generated Sun Feb 13 18:01:28 2011 PST by vadim +# Generated Sun Feb 13 22:28:16 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 Sun Feb 13 18:01:28 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:16 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 87a48f2fc..6b96e7dff 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.3474 # -# Generated Sun Feb 13 18:01:28 2011 PST by vadim +# Generated Sun Feb 13 22:28:16 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 4c9cd1f25..32fa3b60d 100755 --- a/test/pf/firewall.fw.orig +++ b/test/pf/firewall.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:00:56 2011 PST by vadim +# Generated Sun Feb 13 22:27:44 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 Sun Feb 13 18:00:56 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:27:44 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall1.fw.orig b/test/pf/firewall1.fw.orig index a59f7e219..69699ac95 100755 --- a/test/pf/firewall1.fw.orig +++ b/test/pf/firewall1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:00:57 2011 PST by vadim +# Generated Sun Feb 13 22:27:45 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 Sun Feb 13 18:00:57 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:27:45 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 087b3aeb5..fe1f18ec8 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.3474 # -# Generated Sun Feb 13 18:00:59 2011 PST by vadim +# Generated Sun Feb 13 22:27:46 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 Sun Feb 13 18:00:59 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:27:46 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 431816f8f..85a77bc05 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.3474 # -# Generated Sun Feb 13 18:01:00 2011 PST by vadim +# Generated Sun Feb 13 22:27:47 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 Sun Feb 13 18:01:00 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:27:47 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 39f64736c..c61899692 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.3474 # -# Generated Sun Feb 13 18:01:01 2011 PST by vadim +# Generated Sun Feb 13 22:27:48 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 Sun Feb 13 18:01:01 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:27:48 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 486e1cb12..8dd232b74 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.3474 # -# Generated Sun Feb 13 18:01:03 2011 PST by vadim +# Generated Sun Feb 13 22:27:51 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 Sun Feb 13 18:01:03 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:27:51 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 18c8e0541..1e2f12289 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.3474 # -# Generated Sun Feb 13 18:01:05 2011 PST by vadim +# Generated Sun Feb 13 22:27:52 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 Sun Feb 13 18:01:05 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:27:52 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 a2ba9ed44..42840b2a2 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.3474 # -# Generated Sun Feb 13 18:01:06 2011 PST by vadim +# Generated Sun Feb 13 22:27:53 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 Sun Feb 13 18:01:06 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:27:53 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall100.fw.orig b/test/pf/firewall100.fw.orig index 365672ef8..d7b3390c0 100755 --- a/test/pf/firewall100.fw.orig +++ b/test/pf/firewall100.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:00:58 2011 PST by vadim +# Generated Sun Feb 13 22:27:45 2011 PST by vadim # # files: * firewall100.fw /etc/fw/pf.fw # files: firewall100.conf /etc/fw/path\ with\ space/pf.conf @@ -157,10 +157,11 @@ run_epilog_and_exit() { configure_interfaces() { : update_addresses_of_interface "em0 10.3.14.81/0xffffff00" "" + $IFCONFIG em0 mtu 1490 update_addresses_of_interface "em1 10.1.1.81/0xffffff00" "" } -log "Activating firewall script generated Sun Feb 13 18:00:58 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:27:45 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall101.fw.orig b/test/pf/firewall101.fw.orig index 5ed484174..930d77d0b 100755 --- a/test/pf/firewall101.fw.orig +++ b/test/pf/firewall101.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:00:58 2011 PST by vadim +# Generated Sun Feb 13 22:27:46 2011 PST by vadim # # files: * firewall101.fw /etc/fw/pf.fw # files: firewall101.conf /etc/fw/path\ with\ space/pf.conf @@ -160,10 +160,11 @@ run_epilog_and_exit() { configure_interfaces() { : update_addresses_of_interface "em0 10.3.14.81/0xffffff00" "" + $IFCONFIG em0 mtu 1490 update_addresses_of_interface "em1 10.1.1.81/0xffffff00" "" } -log "Activating firewall script generated Sun Feb 13 18:00:58 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:27:46 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall102.fw.orig b/test/pf/firewall102.fw.orig index e6fcc03a9..71d3ab157 100755 --- a/test/pf/firewall102.fw.orig +++ b/test/pf/firewall102.fw.orig @@ -3,7 +3,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:00:59 2011 PST by vadim +# Generated Sun Feb 13 22:27:47 2011 PST by vadim # # files: * firewall102.fw /etc/fw/pf.fw # files: firewall102.conf /etc/fw/path\ with\ space/pf.conf @@ -21,7 +21,7 @@ gateway_enable="YES" network_interfaces="em0 em1" -ifconfig_em0="10.3.14.81 netmask 0xffffff00" +ifconfig_em0="10.3.14.81 netmask 0xffffff00 mtu 1490 " ifconfig_em1="10.1.1.81 netmask 0xffffff00" pf_enable="YES" diff --git a/test/pf/firewall103-1.fw.orig b/test/pf/firewall103-1.fw.orig index babea5b1e..356ad353a 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.3474 # -# Generated Sun Feb 13 18:01:01 2011 PST by vadim +# Generated Sun Feb 13 22:27:49 2011 PST by vadim # # files: * firewall103-1.fw /etc/fw/pf.fw # files: firewall103-1.conf /etc/fw/path\ with\ space/pf.conf @@ -385,7 +385,7 @@ configure_interfaces() { update_addresses_of_interface "em3" "" } -log "Activating firewall script generated Sun Feb 13 18:01:01 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:27:49 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 b71d2518a..b30db6ce3 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.3474 # -# Generated Sun Feb 13 18:01:02 2011 PST by vadim +# Generated Sun Feb 13 22:27:49 2011 PST by vadim # # files: * firewall103-2.fw /etc/fw/pf.fw # files: firewall103-2.conf /etc/fw/path\ with\ space/pf.conf @@ -385,7 +385,7 @@ configure_interfaces() { update_addresses_of_interface "em3" "" } -log "Activating firewall script generated Sun Feb 13 18:01:02 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:27:49 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall103.fw.orig b/test/pf/firewall103.fw.orig index 9bc3af3a4..d6bf9593a 100755 --- a/test/pf/firewall103.fw.orig +++ b/test/pf/firewall103.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:00 2011 PST by vadim +# Generated Sun Feb 13 22:27:48 2011 PST by vadim # # files: * firewall103.fw /etc/fw/pf.fw # files: firewall103.conf /etc/fw/path\ with\ space/pf.conf @@ -388,7 +388,7 @@ configure_interfaces() { update_addresses_of_interface "em3" "" } -log "Activating firewall script generated Sun Feb 13 18:01:00 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:27:48 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 08f535190..39b3c655e 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.3474 # -# Generated Sun Feb 13 18:01:03 2011 PST by vadim +# Generated Sun Feb 13 22:27:51 2011 PST by vadim # # files: * firewall104-1.fw /etc/fw/pf.fw # files: firewall104-1.conf /etc/fw/path\ with\ space/pf.conf @@ -384,7 +384,7 @@ configure_interfaces() { update_addresses_of_interface "em3" "" } -log "Activating firewall script generated Sun Feb 13 18:01:03 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:27:51 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall104.fw.orig b/test/pf/firewall104.fw.orig index 03b8a0976..05d88c64b 100755 --- a/test/pf/firewall104.fw.orig +++ b/test/pf/firewall104.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:02 2011 PST by vadim +# Generated Sun Feb 13 22:27:50 2011 PST by vadim # # files: * firewall104.fw /etc/fw/pf.fw # files: firewall104.conf /etc/fw/path\ with\ space/pf.conf @@ -387,7 +387,7 @@ configure_interfaces() { update_addresses_of_interface "em3" "" } -log "Activating firewall script generated Sun Feb 13 18:01:02 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:27:50 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall105.fw.orig b/test/pf/firewall105.fw.orig index 931116f9c..daccb7c68 100755 --- a/test/pf/firewall105.fw.orig +++ b/test/pf/firewall105.fw.orig @@ -3,7 +3,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:04 2011 PST by vadim +# Generated Sun Feb 13 22:27:52 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 d3eeff793..41fb67bb7 100755 --- a/test/pf/firewall106.fw.orig +++ b/test/pf/firewall106.fw.orig @@ -3,7 +3,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:05 2011 PST by vadim +# Generated Sun Feb 13 22:27:53 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 52a5fc8e0..a927d03b1 100755 --- a/test/pf/firewall107.fw.orig +++ b/test/pf/firewall107.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:06 2011 PST by vadim +# Generated Sun Feb 13 22:27:54 2011 PST by vadim # # files: * firewall107.fw /etc/fw/pf.fw # files: firewall107.conf /etc/fw/path\ with\ space/pf.conf @@ -388,7 +388,7 @@ configure_interfaces() { update_addresses_of_interface "vlan102 192.168.102.1/0xffffff00" "" } -log "Activating firewall script generated Sun Feb 13 18:01:06 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:27:54 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall108.fw.orig b/test/pf/firewall108.fw.orig index c337cb675..fda9ed28d 100755 --- a/test/pf/firewall108.fw.orig +++ b/test/pf/firewall108.fw.orig @@ -3,7 +3,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:07 2011 PST by vadim +# Generated Sun Feb 13 22:27:54 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/firewall11.fw.orig b/test/pf/firewall11.fw.orig index cd1546a81..dc2717253 100755 --- a/test/pf/firewall11.fw.orig +++ b/test/pf/firewall11.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:07 2011 PST by vadim +# Generated Sun Feb 13 22:27:55 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 Sun Feb 13 18:01:07 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:27:55 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall110.fw.orig b/test/pf/firewall110.fw.orig index 3650d9a0d..558f1fcf2 100755 --- a/test/pf/firewall110.fw.orig +++ b/test/pf/firewall110.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:08 2011 PST by vadim +# Generated Sun Feb 13 22:27:55 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 Sun Feb 13 18:01:08 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:27:55 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall12.fw.orig b/test/pf/firewall12.fw.orig index fec58f9be..6d45fd432 100755 --- a/test/pf/firewall12.fw.orig +++ b/test/pf/firewall12.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:08 2011 PST by vadim +# Generated Sun Feb 13 22:27:56 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 Sun Feb 13 18:01:08 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:27:56 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall13.fw.orig b/test/pf/firewall13.fw.orig index 5aa5a139d..bf06f1e07 100755 --- a/test/pf/firewall13.fw.orig +++ b/test/pf/firewall13.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:09 2011 PST by vadim +# Generated Sun Feb 13 22:27:56 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 Sun Feb 13 18:01:09 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:27:56 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 e3806ba9c..bf514ba11 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.3474 # -# Generated Sun Feb 13 18:01:10 2011 PST by vadim +# Generated Sun Feb 13 22:27:58 2011 PST by vadim # # files: * firewall14-1.fw /etc/firewall14-1.fw # files: firewall14-1.conf /etc/firewall14-1.conf @@ -241,7 +241,7 @@ configure_interfaces() { update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" "" } -log "Activating firewall script generated Sun Feb 13 18:01:10 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:27:58 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall14.fw.orig b/test/pf/firewall14.fw.orig index 43d29b8d9..743492b54 100755 --- a/test/pf/firewall14.fw.orig +++ b/test/pf/firewall14.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:09 2011 PST by vadim +# Generated Sun Feb 13 22:27:57 2011 PST by vadim # # files: * firewall14.fw /etc/firewall14.fw # files: firewall14.conf /etc/firewall14.conf @@ -241,7 +241,7 @@ configure_interfaces() { update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" "" } -log "Activating firewall script generated Sun Feb 13 18:01:09 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:27:57 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 063361460..d2772efe3 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.3474 # -# Generated Sun Feb 13 18:01:12 2011 PST by vadim +# Generated Sun Feb 13 22:28:00 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 Sun Feb 13 18:01:12 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:00 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall2.fw.orig b/test/pf/firewall2.fw.orig index 093f01c68..9852850d6 100755 --- a/test/pf/firewall2.fw.orig +++ b/test/pf/firewall2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:11 2011 PST by vadim +# Generated Sun Feb 13 22:27:58 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 Sun Feb 13 18:01:11 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:27:58 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall20.fw.orig b/test/pf/firewall20.fw.orig index f07d1a8b3..51a05cb95 100755 --- a/test/pf/firewall20.fw.orig +++ b/test/pf/firewall20.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:11 2011 PST by vadim +# Generated Sun Feb 13 22:27:59 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 Sun Feb 13 18:01:11 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:27:59 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall21.fw.orig b/test/pf/firewall21.fw.orig index 184d5e90f..1120502d5 100755 --- a/test/pf/firewall21.fw.orig +++ b/test/pf/firewall21.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:12 2011 PST by vadim +# Generated Sun Feb 13 22:27:59 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 Sun Feb 13 18:01:12 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:27:59 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall22.fw.orig b/test/pf/firewall22.fw.orig index 8e9fc9e04..963f2db33 100755 --- a/test/pf/firewall22.fw.orig +++ b/test/pf/firewall22.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:13 2011 PST by vadim +# Generated Sun Feb 13 22:28:01 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 Sun Feb 13 18:01:13 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:01 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall3.fw.orig b/test/pf/firewall3.fw.orig index 6d83fd103..6fcd4eb6f 100755 --- a/test/pf/firewall3.fw.orig +++ b/test/pf/firewall3.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:13 2011 PST by vadim +# Generated Sun Feb 13 22:28:01 2011 PST by vadim # # files: * firewall3.fw /etc/firewall3.fw # files: firewall3.conf /etc/firewall3.conf @@ -159,7 +159,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Sun Feb 13 18:01:13 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:01 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall33.fw.orig b/test/pf/firewall33.fw.orig index 5fca64722..9d9c959a4 100755 --- a/test/pf/firewall33.fw.orig +++ b/test/pf/firewall33.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:15 2011 PST by vadim +# Generated Sun Feb 13 22:28:02 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 Sun Feb 13 18:01:15 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:02 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall34.fw.orig b/test/pf/firewall34.fw.orig index ef09b4724..468371344 100755 --- a/test/pf/firewall34.fw.orig +++ b/test/pf/firewall34.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:14 2011 PST by vadim +# Generated Sun Feb 13 22:28:02 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 Sun Feb 13 18:01:14 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:02 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall38.fw.orig b/test/pf/firewall38.fw.orig index 662c578ec..813fab5a7 100755 --- a/test/pf/firewall38.fw.orig +++ b/test/pf/firewall38.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:15 2011 PST by vadim +# Generated Sun Feb 13 22:28:03 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 Sun Feb 13 18:01:15 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:03 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall39.fw.orig b/test/pf/firewall39.fw.orig index 7e106ce70..535168a76 100755 --- a/test/pf/firewall39.fw.orig +++ b/test/pf/firewall39.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:16 2011 PST by vadim +# Generated Sun Feb 13 22:28:04 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 Sun Feb 13 18:01:16 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:04 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall4.fw.orig b/test/pf/firewall4.fw.orig index b2dd85bb6..6d44961f2 100755 --- a/test/pf/firewall4.fw.orig +++ b/test/pf/firewall4.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:17 2011 PST by vadim +# Generated Sun Feb 13 22:28:04 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 Sun Feb 13 18:01:17 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:04 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 1226bccc4..2264b9c1a 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.3474 # -# Generated Sun Feb 13 18:01:18 2011 PST by vadim +# Generated Sun Feb 13 22:28:05 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 Sun Feb 13 18:01:18 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:05 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall40.fw.orig b/test/pf/firewall40.fw.orig index 98ad3a829..c8c4c9953 100755 --- a/test/pf/firewall40.fw.orig +++ b/test/pf/firewall40.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:17 2011 PST by vadim +# Generated Sun Feb 13 22:28:05 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 Sun Feb 13 18:01:17 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:05 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall41.fw.orig b/test/pf/firewall41.fw.orig index 7eebd8889..ea9aeaeb5 100755 --- a/test/pf/firewall41.fw.orig +++ b/test/pf/firewall41.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:18 2011 PST by vadim +# Generated Sun Feb 13 22:28:06 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 Sun Feb 13 18:01:18 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:06 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall5.fw.orig b/test/pf/firewall5.fw.orig index c24b10d60..4e91a443d 100755 --- a/test/pf/firewall5.fw.orig +++ b/test/pf/firewall5.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:19 2011 PST by vadim +# Generated Sun Feb 13 22:28:06 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 Sun Feb 13 18:01:19 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:06 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall51.fw.orig b/test/pf/firewall51.fw.orig index 6321ef866..09fa34f0c 100755 --- a/test/pf/firewall51.fw.orig +++ b/test/pf/firewall51.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:20 2011 PST by vadim +# Generated Sun Feb 13 22:28:07 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 Sun Feb 13 18:01:20 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:07 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall6.fw.orig b/test/pf/firewall6.fw.orig index b7342d82a..5286a565e 100755 --- a/test/pf/firewall6.fw.orig +++ b/test/pf/firewall6.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:20 2011 PST by vadim +# Generated Sun Feb 13 22:28:07 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 Sun Feb 13 18:01:20 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:07 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall62.fw.orig b/test/pf/firewall62.fw.orig index ac55ee3e2..03407a4c7 100755 --- a/test/pf/firewall62.fw.orig +++ b/test/pf/firewall62.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:21 2011 PST by vadim +# Generated Sun Feb 13 22:28:08 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 Sun Feb 13 18:01:21 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:08 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall63.fw.orig b/test/pf/firewall63.fw.orig index 81335431a..5e2071b83 100755 --- a/test/pf/firewall63.fw.orig +++ b/test/pf/firewall63.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:21 2011 PST by vadim +# Generated Sun Feb 13 22:28:09 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 Sun Feb 13 18:01:21 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:09 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall7.fw.orig b/test/pf/firewall7.fw.orig index 0acabd888..35cc1bcea 100755 --- a/test/pf/firewall7.fw.orig +++ b/test/pf/firewall7.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:22 2011 PST by vadim +# Generated Sun Feb 13 22:28:09 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 Sun Feb 13 18:01:22 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:09 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall70.fw.orig b/test/pf/firewall70.fw.orig index 7d9748f30..5c7841014 100755 --- a/test/pf/firewall70.fw.orig +++ b/test/pf/firewall70.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:22 2011 PST by vadim +# Generated Sun Feb 13 22:28:10 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 Sun Feb 13 18:01:22 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:10 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall8.fw.orig b/test/pf/firewall8.fw.orig index 994f07a57..b00e9d696 100755 --- a/test/pf/firewall8.fw.orig +++ b/test/pf/firewall8.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:23 2011 PST by vadim +# Generated Sun Feb 13 22:28:11 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 Sun Feb 13 18:01:23 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:11 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 a83b64d2d..2a47fc20c 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.3474 # -# Generated Sun Feb 13 18:01:24 2011 PST by vadim +# Generated Sun Feb 13 22:28:12 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 Sun Feb 13 18:01:24 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:12 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall80.fw.orig b/test/pf/firewall80.fw.orig index b44f4280f..27ec0cbcf 100755 --- a/test/pf/firewall80.fw.orig +++ b/test/pf/firewall80.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:23 2011 PST by vadim +# Generated Sun Feb 13 22:28:11 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 Sun Feb 13 18:01:23 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:11 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall9.fw.orig b/test/pf/firewall9.fw.orig index 86bf49768..3b0ba2183 100755 --- a/test/pf/firewall9.fw.orig +++ b/test/pf/firewall9.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:24 2011 PST by vadim +# Generated Sun Feb 13 22:28:12 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 Sun Feb 13 18:01:24 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:12 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall91.fw.orig b/test/pf/firewall91.fw.orig index 7906b963c..0d11041b3 100755 --- a/test/pf/firewall91.fw.orig +++ b/test/pf/firewall91.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:25 2011 PST by vadim +# Generated Sun Feb 13 22:28:13 2011 PST by vadim # # files: * firewall91.fw /etc/fw/pf.fw # files: firewall91.conf /etc/fw/pf.conf @@ -240,7 +240,7 @@ configure_interfaces() { update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" "" } -log "Activating firewall script generated Sun Feb 13 18:01:25 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:13 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall92.fw.orig b/test/pf/firewall92.fw.orig index 86fcf9bd1..b9fde0fb1 100755 --- a/test/pf/firewall92.fw.orig +++ b/test/pf/firewall92.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3474 # -# Generated Sun Feb 13 18:01:26 2011 PST by vadim +# Generated Sun Feb 13 22:28:13 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 Sun Feb 13 18:01:26 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:13 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 f2c41f96d..9728d5f29 100644 --- a/test/pf/objects-for-regression-tests.fwb +++ b/test/pf/objects-for-regression-tests.fwb @@ -19855,7 +19855,7 @@ - + @@ -19948,7 +19948,14 @@ - + + + + + + + + @@ -20306,7 +20313,7 @@ - + @@ -20399,7 +20406,14 @@ - + + + + + + + + @@ -20420,6 +20434,7 @@ + @@ -20509,7 +20524,7 @@ - + @@ -20602,7 +20617,14 @@ - + + + + + + + + diff --git a/test/pf/pf_cluster_1_openbsd-1.fw.orig b/test/pf/pf_cluster_1_openbsd-1.fw.orig index d2c946ba9..a19bed753 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.3474 # -# Generated Sun Feb 13 18:01:29 2011 PST by vadim +# Generated Sun Feb 13 22:28:16 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 "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Sun Feb 13 18:01:29 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:16 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 123989b2f..09f66885a 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.3474 # -# Generated Sun Feb 13 18:01:29 2011 PST by vadim +# Generated Sun Feb 13 22:28:16 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 @@ -190,7 +190,7 @@ configure_interfaces() { update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Sun Feb 13 18:01:29 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:16 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 d69c4507a..07a2f5946 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.3474 # -# Generated Sun Feb 13 18:01:29 2011 PST by vadim +# Generated Sun Feb 13 22:28:16 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 @@ -284,9 +284,9 @@ configure_interfaces() { sync_vlan_interfaces sync_carp_interfaces carp0 carp1 sync_pfsync_interfaces pfsync0 - $IFCONFIG carp0 vhid 101 pass secret advskew 5 carpdev en0 + $IFCONFIG carp0 vhid 101 pass secret advskew 5 update_addresses_of_interface "carp0 172.24.0.1/0xffffff00 172.24.0.1/0xffffff00" "" - $IFCONFIG carp1 vhid 100 pass secret advskew 5 carpdev en1 + $IFCONFIG carp1 vhid 100 pass secret advskew 5 update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" update_addresses_of_interface "en0 172.24.0.2/0xffffff00" "" $IFCONFIG pfsync0 syncdev en0 @@ -294,7 +294,7 @@ configure_interfaces() { update_addresses_of_interface "en1 192.168.1.2/0xffffff00" "" } -log "Activating firewall script generated Sun Feb 13 18:01:29 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:16 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 da8ccb9c6..ae4e30a12 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.3474 # -# Generated Sun Feb 13 18:01:29 2011 PST by vadim +# Generated Sun Feb 13 22:28:16 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 @@ -183,15 +183,15 @@ run_epilog_and_exit() { configure_interfaces() { : sync_carp_interfaces carp0 carp1 - $IFCONFIG carp0 vhid 101 pass secret advskew 10 carpdev en0 + $IFCONFIG carp0 vhid 101 pass secret advskew 10 update_addresses_of_interface "carp0 172.24.0.1/0xffffff00 172.24.0.1/0xffffff00" "" - $IFCONFIG carp1 vhid 100 pass secret advskew 10 carpdev en1 + $IFCONFIG carp1 vhid 100 pass secret advskew 10 update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" update_addresses_of_interface "en0 172.24.0.3/0xffffff00" "" update_addresses_of_interface "en1 192.168.1.3/0xffffff00" "" } -log "Activating firewall script generated Sun Feb 13 18:01:29 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:16 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 85c0f0e39..93e5d272a 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.3474 # -# Generated Sun Feb 13 18:01:29 2011 PST by vadim +# Generated Sun Feb 13 22:28:16 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 "vlan100 172.20.0.2/0xffffff00" "" } -log "Activating firewall script generated Sun Feb 13 18:01:29 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:16 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 f1f0fd71f..9a59d420a 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.3474 # -# Generated Sun Feb 13 18:01:29 2011 PST by vadim +# Generated Sun Feb 13 22:28:17 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 @@ -194,7 +194,7 @@ configure_interfaces() { update_addresses_of_interface "vlan100 172.20.0.3/0xffffff00" "" } -log "Activating firewall script generated Sun Feb 13 18:01:29 2011 by vadim" +log "Activating firewall script generated Sun Feb 13 22:28:17 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 a785c12f6..8486e0821 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.3474 # -# Generated Sun Feb 13 18:01:29 2011 PST by vadim +# Generated Sun Feb 13 22:28:17 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 @@ -19,9 +19,9 @@ gateway_enable="YES" cloned_interfaces="carp0 carp1" network_interfaces="carp0 carp1 en0 en1" -ifconfig_carp0="vhid 101 pass secret advskew 10 carpdev en0" +ifconfig_carp0="vhid 101 pass secret advskew 10" ifconfig_carp0="172.24.0.1 netmask 0xffffff00" -ifconfig_carp1="vhid 100 pass secret advskew 10 carpdev en1" +ifconfig_carp1="vhid 100 pass secret advskew 10" ifconfig_carp1="192.168.1.1 netmask 0xffffff00" pfsync_syncdev="en0" pfsync_syncpeer="172.24.0.2"