diff --git a/doc/ChangeLog b/doc/ChangeLog index eb51a2ced..bd5b8adb9 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,11 @@ +2011-02-11 vadim + + * OSConfigurator_bsd_interfaces.cpp (interfaceIfconfigLine): fixes + #2058 "Ability to configure mtu and metric of regular inetrfaces". + "Advanced settings" dialog of the interface object provides + controls to configure MTU and possibly add any additional ifconfig + parameters. This is available for OpenBSD and FreeBSD. + 2011-02-10 vadim * NamedObjectsManagerPIX.cpp (getClearCommands): fixes #2060 diff --git a/src/libgui/DialogFactory.cpp b/src/libgui/DialogFactory.cpp index a09b287be..4dce68f0b 100644 --- a/src/libgui/DialogFactory.cpp +++ b/src/libgui/DialogFactory.cpp @@ -70,7 +70,7 @@ #include "linux24IfaceOptsDialog.h" #include "secuwallIfaceOptsDialog.h" #include "vlanOnlyIfaceOptsDialog.h" -#include "openbsdIfaceOptsDialog.h" +#include "bsdIfaceOptsDialog.h" #include "pixosIfaceOptsDialog.h" #include "clusterMembersDialog.h" @@ -302,7 +302,7 @@ QWidget *DialogFactory::createIfaceDialog(QWidget *parent,FWObject *o) if (dlgname=="secuwall") return new secuwallIfaceOptsDialog(parent, o); if (dlgname=="linux24") return new linux24IfaceOptsDialog(parent, o); - if (dlgname=="openbsd") return new openbsdIfaceOptsDialog(parent, o); + if (dlgname=="bsd") return new bsdIfaceOptsDialog(parent, o); if (dlgname=="pix_os") return new pixosIfaceOptsDialog(parent, o); if (dlgname=="vlan_only") return new vlanOnlyIfaceOptsDialog(parent, o); diff --git a/src/libgui/openbsdIfaceOptsDialog.cpp b/src/libgui/bsdIfaceOptsDialog.cpp similarity index 76% rename from src/libgui/openbsdIfaceOptsDialog.cpp rename to src/libgui/bsdIfaceOptsDialog.cpp index 89190d571..b6bd590e6 100644 --- a/src/libgui/openbsdIfaceOptsDialog.cpp +++ b/src/libgui/bsdIfaceOptsDialog.cpp @@ -24,7 +24,7 @@ */ -#include "openbsdIfaceOptsDialog.h" +#include "bsdIfaceOptsDialog.h" #include "platforms.h" #include "FWCmdChange.h" @@ -43,10 +43,10 @@ using namespace std; using namespace libfwbuilder; -openbsdIfaceOptsDialog::openbsdIfaceOptsDialog(QWidget *parent, FWObject *o) +bsdIfaceOptsDialog::bsdIfaceOptsDialog(QWidget *parent, FWObject *o) : QDialog(parent) { - m_dialog = new Ui::openbsdIfaceOptsDialog_q; + m_dialog = new Ui::bsdIfaceOptsDialog_q; m_dialog->setupUi(this); setWindowModality(Qt::WindowModal); obj = o; @@ -69,7 +69,18 @@ openbsdIfaceOptsDialog::openbsdIfaceOptsDialog(QWidget *parent, FWObject *o) m_dialog->iface_type_label->show(); } + int mtu = ifopt->getInt("iface_mtu"); + if (mtu <=0 ) + { + mtu = 1500; + ifopt->setInt("iface_mtu", mtu); + } + data.registerOption(m_dialog->vlan_id, ifopt, "vlan_id"); + data.registerOption(m_dialog->iface_configure_mtu, ifopt, "iface_configure_mtu"); + data.registerOption(m_dialog->iface_mtu, ifopt, "iface_mtu"); + data.registerOption(m_dialog->iface_options, ifopt, "iface_options"); + data.registerOption(m_dialog->enable_stp, ifopt, "enable_stp"); data.loadAll(); @@ -78,7 +89,7 @@ openbsdIfaceOptsDialog::openbsdIfaceOptsDialog(QWidget *parent, FWObject *o) typeChanged(""); } -openbsdIfaceOptsDialog::~openbsdIfaceOptsDialog() +bsdIfaceOptsDialog::~bsdIfaceOptsDialog() { delete m_dialog; } @@ -86,7 +97,7 @@ openbsdIfaceOptsDialog::~openbsdIfaceOptsDialog() /* * store all data in the object */ -void openbsdIfaceOptsDialog::accept() +void bsdIfaceOptsDialog::accept() { // validate user input before saving if (!validate()) return; @@ -117,40 +128,48 @@ void openbsdIfaceOptsDialog::accept() QDialog::accept(); } -void openbsdIfaceOptsDialog::reject() +void bsdIfaceOptsDialog::reject() { QDialog::reject(); } -void openbsdIfaceOptsDialog::help() +void bsdIfaceOptsDialog::help() { QString tab_title = m_dialog->tabWidget->tabText( m_dialog->tabWidget->currentIndex()); QString anchor = tab_title.replace('/', '-').replace(' ', '-').toLower(); Help *h = Help::getHelpWindow(this); h->setName("Interface OpenBSD"); - h->setSource(QUrl("openbsdIfaceOptsDialog.html#" + anchor)); + h->setSource(QUrl("bsdIfaceOptsDialog.html#" + anchor)); h->raise(); h->show(); } -void openbsdIfaceOptsDialog::typeChanged(const QString&) +void bsdIfaceOptsDialog::typeChanged(const QString&) { QString new_type = m_dialog->iface_type->itemData( m_dialog->iface_type->currentIndex()).toString(); // enable VLAN ID line edit for type VLAN - if (new_type == "8021q") + if (new_type.isEmpty() || new_type == "ethernet") { m_dialog->options_stack->setCurrentIndex(1); return; } + if (new_type == "8021q") + { + m_dialog->options_stack->setCurrentIndex(2); + return; + } + // there is also page 3 for bridge (with just "enable stp" + // checkbox) but we dont use it yet + // page 0 is empty m_dialog->options_stack->setCurrentIndex(0); } -bool openbsdIfaceOptsDialog::validate() +bool bsdIfaceOptsDialog::validate() { return true; } diff --git a/src/libgui/openbsdIfaceOptsDialog.h b/src/libgui/bsdIfaceOptsDialog.h similarity index 78% rename from src/libgui/openbsdIfaceOptsDialog.h rename to src/libgui/bsdIfaceOptsDialog.h index 55b5b1ed5..15f2ab62f 100644 --- a/src/libgui/openbsdIfaceOptsDialog.h +++ b/src/libgui/bsdIfaceOptsDialog.h @@ -23,10 +23,10 @@ */ -#ifndef __OPENBSDIFACEOPTSDIALOG_H_ -#define __OPENBSDIFACEOPTSDIALOG_H_ +#ifndef __BSDIFACEOPTSDIALOG_H_ +#define __BSDIFACEOPTSDIALOG_H_ -#include +#include #include "DialogData.h" #include @@ -36,18 +36,18 @@ namespace libfwbuilder class FWObject; }; -class openbsdIfaceOptsDialog : public QDialog +class bsdIfaceOptsDialog : public QDialog { - Q_OBJECT + Q_OBJECT; public: - openbsdIfaceOptsDialog(QWidget *parent, libfwbuilder::FWObject *o); - ~openbsdIfaceOptsDialog(); + bsdIfaceOptsDialog(QWidget *parent, libfwbuilder::FWObject *o); + ~bsdIfaceOptsDialog(); private: libfwbuilder::FWObject *obj; DialogData data; - Ui::openbsdIfaceOptsDialog_q *m_dialog; + Ui::bsdIfaceOptsDialog_q *m_dialog; bool cluster_interface; /** validate user input for different interface types */ @@ -60,5 +60,5 @@ protected slots: void typeChanged(const QString &new_type); }; -#endif // __OPENBSDIFACEOPTSDIALOG_H_ +#endif // __BSDIFACEOPTSDIALOG_H_ diff --git a/src/libgui/bsdifaceoptsdialog_q.ui b/src/libgui/bsdifaceoptsdialog_q.ui new file mode 100644 index 000000000..5d0fb341f --- /dev/null +++ b/src/libgui/bsdifaceoptsdialog_q.ui @@ -0,0 +1,381 @@ + + + bsdIfaceOptsDialog_q + + + + 0 + 0 + 376 + 318 + + + + BSD: interface settings + + + + + + + + Help + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 151 + 27 + + + + + + + + &OK + + + + + + true + + + true + + + + + + + &Cancel + + + + + + true + + + + + + + + + QTabWidget::Rounded + + + 0 + + + + + :/Icons/Options:/Icons/Options + + + Options + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 16 + + + + + + + + Qt::RightToLeft + + + Device Type + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Set MTU to + + + + + + + 1 + + + 1500 + + + 1500 + + + + + + + Qt::Horizontal + + + + 147 + 20 + + + + + + + + Qt::RightToLeft + + + Options + + + + + + + additional arguments for ifconfig + + + + + + + Qt::Horizontal + + + + 147 + 20 + + + + + + + + + 0 + 0 + + + + 1 + + + + + + + + + true + + + Qt::RightToLeft + + + VLAN ID + + + + + + + 4095 + + + + + + + Qt::Horizontal + + + + 140 + 20 + + + + + + + + Qt::Vertical + + + + 20 + 43 + + + + + + + + + + + + Enable STP + + + + + + + Qt::Vertical + + + + 20 + 173 + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + buttonOk + buttonCancel + tabWidget + + + + + + + buttonOk + clicked() + bsdIfaceOptsDialog_q + accept() + + + 316 + 472 + + + 20 + 20 + + + + + buttonCancel + clicked() + bsdIfaceOptsDialog_q + reject() + + + 397 + 472 + + + 20 + 20 + + + + + buttonHelp + clicked() + bsdIfaceOptsDialog_q + help() + + + 68 + 464 + + + 231 + 245 + + + + + iface_type + currentIndexChanged(QString) + bsdIfaceOptsDialog_q + typeChanged(QString) + + + 287 + 196 + + + 286 + 261 + + + + + + typeChanged(QString) + + diff --git a/src/libgui/libgui.pro b/src/libgui/libgui.pro index da85d5fe9..935acdd60 100644 --- a/src/libgui/libgui.pro +++ b/src/libgui/libgui.pro @@ -121,7 +121,7 @@ HEADERS += ../../config.h \ vlanOnlyIfaceOptsDialog.h \ linux24IfaceOptsDialog.h \ pixosIfaceOptsDialog.h \ - openbsdIfaceOptsDialog.h \ + bsdIfaceOptsDialog.h \ clusterMembersDialog.h \ CompilerOutputPanel.h \ CompilerDriverFactory.h \ @@ -300,7 +300,7 @@ SOURCES += ProjectPanel.cpp \ vlanOnlyIfaceOptsDialog.cpp \ linux24IfaceOptsDialog.cpp \ pixosIfaceOptsDialog.cpp \ - openbsdIfaceOptsDialog.cpp \ + bsdIfaceOptsDialog.cpp \ clusterMembersDialog.cpp \ CompilerOutputPanel.cpp \ CompilerDriverFactory.cpp \ @@ -437,7 +437,7 @@ FORMS = FWBMainWindow_q.ui \ secuwallosadvanceddialog_q.ui \ secuwallifaceoptsdialog_q.ui \ clustermembersdialog_q.ui \ - openbsdifaceoptsdialog_q.ui \ + bsdifaceoptsdialog_q.ui \ colorlabelmenuitem_q.ui \ debugdialog_q.ui \ filepropdialog_q.ui \ diff --git a/src/libgui/linux24ifaceoptsdialog_q.ui b/src/libgui/linux24ifaceoptsdialog_q.ui index 6136b00d8..c74d6af9d 100644 --- a/src/libgui/linux24ifaceoptsdialog_q.ui +++ b/src/libgui/linux24ifaceoptsdialog_q.ui @@ -1,7 +1,8 @@ - + + linux24IfaceOptsDialog_q - - + + 0 0 @@ -9,28 +10,28 @@ 322 - + Linux: interface settings - - - + + + - - + + Help - + Qt::Horizontal - + QSizePolicy::Expanding - + 151 27 @@ -39,62 +40,62 @@ - - + + &OK - + - + true - + true - - + + &Cancel - + - + true - - - + + + QTabWidget::Rounded - + 0 - - - Options - - - + + + :/Icons/Options:/Icons/Options - - + + Options + + + - + Qt::Vertical - + QSizePolicy::Fixed - + 20 16 @@ -102,25 +103,25 @@ - - - + + + Qt::RightToLeft - + Device Type - - + + - + - + Qt::Horizontal - + 40 20 @@ -128,46 +129,46 @@ - - - - + + + + 0 0 - - 3 + + 0 - - - - - - + + + + + + true - + Qt::RightToLeft - + VLAN ID - - - + + + 4095 - - - + + + Qt::Horizontal - + 140 20 @@ -175,12 +176,12 @@ - - - + + + Qt::Vertical - + 20 43 @@ -190,21 +191,21 @@ - - - - - + + + + + Enable STP - - - + + + Qt::Vertical - + 20 173 @@ -214,105 +215,105 @@ - - - - - + + + + + Bonding policy: - - + + - + - + balance-rr - + active-backup - + balance-xor - + broadcast - + 802.3ad - + balance-tlb - + balance-alb - - - + + + Xmit hash policy: - - + + - + - + layer2 - + layer3+4 - - - + + + Other parameters: - - + + - + - + Qt::Vertical - + 20 40 @@ -326,14 +327,14 @@ - + buttonOk buttonCancel tabWidget - + @@ -342,11 +343,11 @@ linux24IfaceOptsDialog_q accept() - + 316 472 - + 20 20 @@ -358,11 +359,11 @@ linux24IfaceOptsDialog_q reject() - + 397 472 - + 20 20 @@ -374,11 +375,11 @@ linux24IfaceOptsDialog_q help() - + 68 464 - + 231 245 @@ -390,11 +391,11 @@ linux24IfaceOptsDialog_q typeChanged(QString) - + 287 196 - + 286 261 @@ -406,11 +407,11 @@ linux24IfaceOptsDialog_q bondingPolicyChanged(QString) - + 268 126 - + 208 160 diff --git a/src/libgui/openbsdifaceoptsdialog_q.ui b/src/libgui/openbsdifaceoptsdialog_q.ui deleted file mode 100644 index 64480d14e..000000000 --- a/src/libgui/openbsdifaceoptsdialog_q.ui +++ /dev/null @@ -1,316 +0,0 @@ - - openbsdIfaceOptsDialog_q - - - - 0 - 0 - 376 - 307 - - - - OpenBSD: interface settings - - - - - - - - Help - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 151 - 27 - - - - - - - - &OK - - - - - - true - - - true - - - - - - - &Cancel - - - - - - true - - - - - - - - - QTabWidget::Rounded - - - 0 - - - - Options - - - - :/Icons/Options:/Icons/Options - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 16 - - - - - - - - Qt::RightToLeft - - - Device Type - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - 1 - - - - - - - - true - - - Qt::RightToLeft - - - VLAN ID - - - - - - - 4095 - - - - - - - Qt::Horizontal - - - - 140 - 20 - - - - - - - - Qt::Vertical - - - - 20 - 43 - - - - - - - - - - - - Enable STP - - - - - - - Qt::Vertical - - - - 20 - 173 - - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - - buttonOk - buttonCancel - tabWidget - - - - - - - buttonOk - clicked() - openbsdIfaceOptsDialog_q - accept() - - - 316 - 472 - - - 20 - 20 - - - - - buttonCancel - clicked() - openbsdIfaceOptsDialog_q - reject() - - - 397 - 472 - - - 20 - 20 - - - - - buttonHelp - clicked() - openbsdIfaceOptsDialog_q - help() - - - 68 - 464 - - - 231 - 245 - - - - - iface_type - currentIndexChanged(QString) - openbsdIfaceOptsDialog_q - typeChanged(QString) - - - 287 - 196 - - - 286 - 261 - - - - - - typeChanged(QString) - - diff --git a/src/pflib/OSConfigurator_bsd.h b/src/pflib/OSConfigurator_bsd.h index d9dd47034..c719fda48 100644 --- a/src/pflib/OSConfigurator_bsd.h +++ b/src/pflib/OSConfigurator_bsd.h @@ -52,9 +52,8 @@ namespace fwcompiler { protected: - QMap update_address_lines; + QMap interface_configuration_lines; QStringList cloned_interfaces; - QStringList interface_configuration_lines; std::set virtual_addresses; @@ -98,8 +97,12 @@ protected: libfwbuilder::Interface *iface, libfwbuilder::StateSyncClusterGroup *sync_group); + // this function generates additional ifconfig parameters + virtual void interfaceIfconfigLine(libfwbuilder::Interface *iface); + virtual QString printAllInterfaceConfigurationLines(); + public: virtual ~OSConfigurator_bsd() {}; diff --git a/src/pflib/OSConfigurator_bsd_interfaces.cpp b/src/pflib/OSConfigurator_bsd_interfaces.cpp index c88b8993f..1048c4dc1 100644 --- a/src/pflib/OSConfigurator_bsd_interfaces.cpp +++ b/src/pflib/OSConfigurator_bsd_interfaces.cpp @@ -312,6 +312,7 @@ string OSConfigurator_bsd::configureInterfaces() { interfaceConfigLineIP(interfaces_by_name[iface_name], all_addresses[iface_name]); + interfaceIfconfigLine(interfaces_by_name[iface_name]); } } @@ -350,10 +351,49 @@ string OSConfigurator_bsd::configureInterfaces() if (!have_pfsync_interfaces) summaryConfigLinePfsync(false); } + + return printAllInterfaceConfigurationLines().toStdString(); } +void OSConfigurator_bsd::interfaceIfconfigLine(Interface *iface) +{ + QString iface_name = iface->getName().c_str(); + + Configlet configlet(fw, "bsd", "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) + { + 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", ""); + } + + if (!ifopt->getStr("iface_options").empty()) + { + configlet.setVariable("options", ifopt->getStr("iface_options").c_str()); + need_additional_ifconfig =true; + } else + configlet.setVariable("options", ""); + + if (need_additional_ifconfig) + interface_configuration_lines[iface_name] << configlet.expand(); +} + void OSConfigurator_bsd::summaryConfigLineIP(QStringList , bool ) { } @@ -364,7 +404,7 @@ void OSConfigurator_bsd::interfaceConfigLineIP( if (iface->isDyn()) return; QStringList arg1; - arg1.push_back(iface->getName().c_str()); + arg1 << iface->getName().c_str(); for (list >::iterator j = all_addresses.begin(); j != all_addresses.end(); ++j) @@ -397,25 +437,22 @@ void OSConfigurator_bsd::interfaceConfigLineIP( nbits--; } - arg1.push_back(QString("%1/0x%2") - .arg(ipaddr.toString().c_str()) - .arg(netm, -8, 16)); + arg1 << QString("%1/0x%2") + .arg(ipaddr.toString().c_str()).arg(netm, -8, 16); } } QString cmd = QString("update_addresses_of_interface \"%1\" \"\"") - .arg(arg1.join(" ")); + .arg(arg1.join(" ")); - //qDebug() << cmd; - - update_address_lines[iface->getName().c_str()] = cmd; + interface_configuration_lines[iface->getName().c_str()] << cmd; } void OSConfigurator_bsd::summaryConfigLineVlan(QStringList vlan_names) { - interface_configuration_lines << + interface_configuration_lines["1_should_sort_before_interfaces_"] << QString("sync_vlan_interfaces %1").arg(vlan_names.join(" ")); } @@ -423,7 +460,7 @@ void OSConfigurator_bsd::summaryConfigLineVlan(QStringList vlan_names) void OSConfigurator_bsd::interfaceConfigLineVlan(Interface *iface, QStringList vlan_names) { - interface_configuration_lines << + interface_configuration_lines[iface->getName().c_str()] << QString("update_vlans_of_interface \"%1 %2\"") .arg(iface->getName().c_str()) .arg(vlan_names.join(" ")); @@ -431,7 +468,7 @@ void OSConfigurator_bsd::interfaceConfigLineVlan(Interface *iface, void OSConfigurator_bsd::summaryConfigLineBridge(QStringList bridge_names) { - interface_configuration_lines << + interface_configuration_lines["1_should_sort_before_interfaces_"] << QString("sync_bridge_interfaces %1").arg(bridge_names.join(" ")); } @@ -439,7 +476,7 @@ void OSConfigurator_bsd::summaryConfigLineBridge(QStringList bridge_names) void OSConfigurator_bsd::interfaceConfigLineBridge(Interface *iface, QStringList bridge_port_names) { - interface_configuration_lines << + interface_configuration_lines[iface->getName().c_str()] << QString("update_bridge_interface %1 \"%2\"") .arg(iface->getName().c_str()) .arg(bridge_port_names.join(" ")); @@ -447,7 +484,7 @@ void OSConfigurator_bsd::interfaceConfigLineBridge(Interface *iface, void OSConfigurator_bsd::summaryConfigLineCARP(QStringList carp_names) { - interface_configuration_lines << + interface_configuration_lines["1_should_sort_before_interfaces_"] << QString("sync_carp_interfaces %1").arg(carp_names.join(" ")); } @@ -507,12 +544,12 @@ void OSConfigurator_bsd::interfaceConfigLineCARPInternal( configlet->setVariable("carp_password", carp_password.c_str()); configlet->setVariable("vhid", vhid); - interface_configuration_lines << configlet->expand(); + interface_configuration_lines[iface->getName().c_str()] << configlet->expand(); } void OSConfigurator_bsd::summaryConfigLinePfsync(bool have_pfsync) { - interface_configuration_lines << + interface_configuration_lines["1_should_sort_before_interfaces_"] << QString("sync_pfsync_interfaces %1").arg(have_pfsync?"pfsync0":""); } @@ -551,20 +588,18 @@ void OSConfigurator_bsd::interfaceConfigLinePfsync( configlet.setVariable("syncpeer", addr->toString().c_str()); } } - interface_configuration_lines << configlet.expand(); + interface_configuration_lines[iface->getName().c_str()] << configlet.expand(); } QString OSConfigurator_bsd::printAllInterfaceConfigurationLines() { - QStringList keys = update_address_lines.keys(); + QStringList keys = interface_configuration_lines.keys(); keys.sort(); - foreach (QString iface_name, keys) - { - interface_configuration_lines << update_address_lines[iface_name]; - } - - return interface_configuration_lines.join("\n"); + QStringList res; + foreach (QString iface, keys) + res << interface_configuration_lines[iface].join("\n"); + return res.join("\n"); } diff --git a/src/pflib/OSConfigurator_freebsd.cpp b/src/pflib/OSConfigurator_freebsd.cpp index 00241baf7..f65a976da 100644 --- a/src/pflib/OSConfigurator_freebsd.cpp +++ b/src/pflib/OSConfigurator_freebsd.cpp @@ -107,11 +107,11 @@ void OSConfigurator_freebsd::summaryConfigLineIP(QStringList names, bool ipv6) { if (ipv6) { - interface_configuration_lines << + interface_configuration_lines["1_should_sort_before_interfaces_"] << QString("ipv6_network_interfaces=\"%1\"").arg(names.join(" ")); } else { - interface_configuration_lines << + interface_configuration_lines["1_should_sort_before_interfaces_"] << QString("network_interfaces=\"%1\"").arg(names.join(" ")); } } @@ -198,6 +198,49 @@ void OSConfigurator_freebsd::interfaceConfigLineIP( OSConfigurator_bsd::interfaceConfigLineIP(iface, all_addresses); } +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) + { + 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", ""); + } + + 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) { FWOptions* options = fw->getOptionsObject(); @@ -205,7 +248,7 @@ void OSConfigurator_freebsd::summaryConfigLineVlan(QStringList vlan_names) { cloned_interfaces += vlan_names; } else - interface_configuration_lines << + interface_configuration_lines["1_should_sort_before_interfaces_"] << QString("sync_vlan_interfaces %1").arg(vlan_names.join(" ")); } @@ -239,9 +282,13 @@ void OSConfigurator_freebsd::interfaceConfigLineVlan(Interface *iface, FWOptions* options = fw->getOptionsObject(); if (options->getBool("generate_rc_conf_file")) { - QStringList outp; - outp << QString("vlans_%1=\"%2\"").arg(iface->getName().c_str()) + QString iface_name = iface->getName().c_str(); + // the "vlans_em2="vlan101 vlan102" will appear next to other lines + // intended for interface em2 + interface_configuration_lines[iface_name] << + QString("vlans_%1=\"%2\"").arg(iface->getName().c_str()) .arg(vlan_names.join(" ")); + foreach(QString vlan_intf_name, vlan_names) { std::auto_ptr int_prop( @@ -252,16 +299,14 @@ void OSConfigurator_freebsd::interfaceConfigLineVlan(Interface *iface, if (int_prop->parseVlan(vlan_intf_name, &parent_name_from_regex, &vlan_id)) { - outp << QString("create_args_%1=\"vlan %2 vlandev %3\"") + interface_configuration_lines[iface_name] << + QString("create_args_%1=\"vlan %2 vlandev %3\"") .arg(vlan_intf_name).arg(vlan_id).arg(iface->getName().c_str()); } } - interface_configuration_lines << outp.join("\n"); + } else - interface_configuration_lines << - QString("update_vlans_of_interface \"%1 %2\"") - .arg(iface->getName().c_str()) - .arg(vlan_names.join(" ")); + OSConfigurator_bsd::interfaceConfigLineVlan(iface, vlan_names); } void OSConfigurator_freebsd::summaryConfigLineBridge(QStringList bridge_names) @@ -332,7 +377,7 @@ void OSConfigurator_freebsd::interfaceConfigLineBridge(Interface *iface, ifconfig_lines[bridge_port] << "up"; } - interface_configuration_lines << outp.join("\n"); + interface_configuration_lines[iface->getName().c_str()] << outp.join("\n"); } else OSConfigurator_bsd::interfaceConfigLineBridge(iface, bridge_port_names); } @@ -365,7 +410,7 @@ void OSConfigurator_freebsd::summaryConfigLinePfsync(bool have_pfsync) FWOptions* options = fw->getOptionsObject(); if (options->getBool("generate_rc_conf_file")) { - interface_configuration_lines << "pfsync_enable=\"YES\""; + interface_configuration_lines["pfsync0"] << "pfsync_enable=\"YES\""; } else OSConfigurator_bsd::summaryConfigLinePfsync(have_pfsync); } @@ -431,7 +476,7 @@ void OSConfigurator_freebsd::interfaceConfigLinePfsync( configlet.setVariable("syncpeer", addr->toString().c_str()); } } - interface_configuration_lines << configlet.expand(); + interface_configuration_lines[iface->getName().c_str()] << configlet.expand(); } else OSConfigurator_bsd::interfaceConfigLinePfsync(iface, state_sync_group); @@ -446,13 +491,11 @@ QString OSConfigurator_freebsd::printAllInterfaceConfigurationLines() printIfconfigLines(ipv6_ifconfig_lines); if (!cloned_interfaces.isEmpty()) - interface_configuration_lines.push_front( + interface_configuration_lines["0_should_be_on_top_"] << QString("cloned_interfaces=\"%1\"") - .arg(cloned_interfaces.join(" "))); - - return interface_configuration_lines.join("\n"); - } else - return OSConfigurator_bsd::printAllInterfaceConfigurationLines(); + .arg(cloned_interfaces.join(" ")); + } + return OSConfigurator_bsd::printAllInterfaceConfigurationLines(); } void OSConfigurator_freebsd::printIfconfigLines(const QMap @@ -465,7 +508,7 @@ void OSConfigurator_freebsd::printIfconfigLines(const QMap foreach (QString iface_name, keys) { const QStringList commands = lines[iface_name]; - interface_configuration_lines << + interface_configuration_lines[iface_name] << QString("ifconfig_%1=\"%2\"").arg(iface_name) .arg(commands.join(" ")); } diff --git a/src/pflib/OSConfigurator_freebsd.h b/src/pflib/OSConfigurator_freebsd.h index 79b692d73..f503a4d37 100644 --- a/src/pflib/OSConfigurator_freebsd.h +++ b/src/pflib/OSConfigurator_freebsd.h @@ -86,6 +86,9 @@ namespace fwcompiler libfwbuilder::Interface *iface, libfwbuilder::StateSyncClusterGroup *sync_group); + // this function generates additional ifconfig parameters + virtual void interfaceIfconfigLine(libfwbuilder::Interface *iface); + virtual QString printAllInterfaceConfigurationLines(); diff --git a/src/res/configlets/bsd/ifconfig_interface b/src/res/configlets/bsd/ifconfig_interface new file mode 100644 index 000000000..1f81f3798 --- /dev/null +++ b/src/res/configlets/bsd/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. +## + +$IFCONFIG {{$interface_name}} {{if have_mtu}}mtu {{$mtu}}{{endif}} {{$options}} + diff --git a/src/res/configlets/freebsd/ifconfig_interface b/src/res/configlets/freebsd/ifconfig_interface new file mode 100644 index 000000000..b9b4969ec --- /dev/null +++ b/src/res/configlets/freebsd/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/src/res/os/freebsd.xml b/src/res/os/freebsd.xml index 18736de07..3e36c95f7 100644 --- a/src/res/os/freebsd.xml +++ b/src/res/os/freebsd.xml @@ -5,7 +5,7 @@ active freebsd freebsd - openbsd + bsd basic diff --git a/src/res/os/openbsd.xml b/src/res/os/openbsd.xml index bdc2ea6d3..605c6ef03 100644 --- a/src/res/os/openbsd.xml +++ b/src/res/os/openbsd.xml @@ -5,7 +5,7 @@ active openbsd openbsd - openbsd + bsd basic diff --git a/test/pf/firewall-base-rulesets.fw.orig b/test/pf/firewall-base-rulesets.fw.orig index 317c51599..9234deacd 100755 --- a/test/pf/firewall-base-rulesets.fw.orig +++ b/test/pf/firewall-base-rulesets.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:18:04 2011 PST by vadim +# Generated Fri Feb 11 12:27:00 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 @@ -30,7 +30,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -163,7 +163,7 @@ configure_interfaces() { update_addresses_of_interface "en2 192.168.100.1/0xffffff00" "" } -log "Activating firewall script generated Thu Feb 10 12:18:04 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:27:00 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 5b38d781b..f8e1b266b 100755 --- a/test/pf/firewall-ipv6-1.fw.orig +++ b/test/pf/firewall-ipv6-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:18:04 2011 PST by vadim +# Generated Fri Feb 11 12:27:00 2011 PST by vadim # # files: * firewall-ipv6-1.fw pf-ipv6.fw # files: firewall-ipv6-1.conf /etc/fw/pf-ipv6.conf @@ -42,7 +42,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -175,7 +175,7 @@ configure_interfaces() { update_addresses_of_interface "lo ::1/128 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Feb 10 12:18:04 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:27:00 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall-ipv6-2.conf.orig b/test/pf/firewall-ipv6-2.conf.orig index e7847d477..66680467e 100644 --- a/test/pf/firewall-ipv6-2.conf.orig +++ b/test/pf/firewall-ipv6-2.conf.orig @@ -5,7 +5,7 @@ # Tables: (5) table { 222.222.222.22 , 222.222.222.23 } table { 2001:5c0:0:2::24 , 3ffe:1200:2000::/36 , 3ffe:1200:2001:1:8000::1 } -table { 61.150.47.112 , 74.125.224.16 , 74.125.224.17 , 74.125.224.18 , 74.125.224.19 , 74.125.224.20 , 192.168.1.0 } +table { 61.150.47.112 , 74.125.224.48 , 74.125.224.49 , 74.125.224.50 , 74.125.224.51 , 74.125.224.52 , 192.168.1.0 } table { 2001:5c0:0:2::24 , 3ffe:1200:2001:1:8000::1 } table { 61.150.47.112 , 192.168.1.0 } diff --git a/test/pf/firewall-ipv6-2.fw.orig b/test/pf/firewall-ipv6-2.fw.orig index c5eb29c72..3b337b564 100755 --- a/test/pf/firewall-ipv6-2.fw.orig +++ b/test/pf/firewall-ipv6-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:18:05 2011 PST by vadim +# Generated Fri Feb 11 12:27:02 2011 PST by vadim # # files: * firewall-ipv6-2.fw pf.fw # files: firewall-ipv6-2.conf pf.conf @@ -46,7 +46,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -179,7 +179,7 @@ configure_interfaces() { update_addresses_of_interface "lo ::1/128 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Feb 10 12:18:05 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:27:02 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 b8eb4f55f..750a2a7de 100755 --- a/test/pf/firewall-ipv6-3.fw.orig +++ b/test/pf/firewall-ipv6-3.fw.orig @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:18:05 2011 PST by vadim +# Generated Fri Feb 11 12:27:02 2011 PST by vadim # # files: * firewall-ipv6-3.fw /etc/firewall-ipv6-3.fw # files: firewall-ipv6-3.conf /etc/firewall-ipv6-3.conf @@ -20,22 +20,22 @@ ipv6_gateway_enable="YES" cloned_interfaces="vlan100 vlan101" +ipv6_network_interfaces="ed0 lo0" +network_interfaces="ed0 lo0 vlan100 vlan101" +ifconfig_ed0="1.1.1.1 netmask 0xffffff00" +ifconfig_ed0="fe80::21d:9ff:fe8b:8e94/64" +ifconfig_ed0_alias0="10.10.10.1 netmask 0xffffff00" +ifconfig_ed0_alias0="2001:db8::1/64" +ifconfig_ed0_alias1="10.10.10.2 netmask 0xffffff00" +ifconfig_ed0_alias1="2001:db8::2/64" vlans_ed1="vlan100 vlan101" create_args_vlan100="vlan 100 vlandev ed1" create_args_vlan101="vlan 101 vlandev ed1" -ipv6_network_interfaces="ed0 lo0" -network_interfaces="ed0 lo0 vlan100 vlan101" -pfsync_enable="YES" -ifconfig_ed0="1.1.1.1 netmask 0xffffff00" -ifconfig_ed0_alias0="10.10.10.1 netmask 0xffffff00" -ifconfig_ed0_alias1="10.10.10.2 netmask 0xffffff00" ifconfig_lo0="127.0.0.1 netmask 0xff000000" +ifconfig_lo0="::1/128" +pfsync_enable="YES" ifconfig_vlan100="172.16.1.1 netmask 0xfffffff0" ifconfig_vlan101="172.16.2.1 netmask 0xfffffff0" -ifconfig_ed0="fe80::21d:9ff:fe8b:8e94/64" -ifconfig_ed0_alias0="2001:db8::1/64" -ifconfig_ed0_alias1="2001:db8::2/64" -ifconfig_lo0="::1/128" pf_enable="YES" pf_rules="/etc/firewall-ipv6-3.conf" diff --git a/test/pf/firewall.fw.orig b/test/pf/firewall.fw.orig index 9cd992f1f..8dde4ac35 100755 --- a/test/pf/firewall.fw.orig +++ b/test/pf/firewall.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:33 2011 PST by vadim +# Generated Fri Feb 11 12:26:31 2011 PST by vadim # # files: * firewall.fw /etc/pf.fw # files: firewall.conf /etc/pf.conf @@ -30,7 +30,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -167,7 +167,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Feb 10 12:17:33 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:31 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall1.fw.orig b/test/pf/firewall1.fw.orig index 4f710d506..0ec8f2033 100755 --- a/test/pf/firewall1.fw.orig +++ b/test/pf/firewall1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:33 2011 PST by vadim +# Generated Fri Feb 11 12:26:31 2011 PST by vadim # # files: * firewall1.fw /etc/fw/firewall1.fw # files: firewall1.conf /etc/fw/firewall1.conf @@ -29,7 +29,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Feb 10 12:17:33 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:31 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 05cb7df9f..3f7f0c685 100755 --- a/test/pf/firewall10-1.fw.orig +++ b/test/pf/firewall10-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:35 2011 PST by vadim +# Generated Fri Feb 11 12:26:33 2011 PST by vadim # # files: * firewall10-1.fw /etc/fw/firewall10-1.fw # files: firewall10-1.conf /etc/fw/firewall10-1.conf @@ -27,7 +27,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -74,7 +74,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Feb 10 12:17:35 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:33 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 a700a8239..e32ed09c5 100755 --- a/test/pf/firewall10-2.fw.orig +++ b/test/pf/firewall10-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:36 2011 PST by vadim +# Generated Fri Feb 11 12:26:34 2011 PST by vadim # # files: * firewall10-2.fw /etc/fw/firewall10-2.fw # files: firewall10-2.conf /etc/fw/firewall10-2.conf @@ -27,7 +27,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -74,7 +74,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Feb 10 12:17:36 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:34 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 1d1db46b5..0dfd3e470 100755 --- a/test/pf/firewall10-3.fw.orig +++ b/test/pf/firewall10-3.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:37 2011 PST by vadim +# Generated Fri Feb 11 12:26:35 2011 PST by vadim # # files: * firewall10-3.fw /etc/fw/firewall10-3.fw # files: firewall10-3.conf /etc/fw/firewall10-3.conf @@ -29,7 +29,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Feb 10 12:17:37 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:35 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 34b744a1c..6bee2e063 100755 --- a/test/pf/firewall10-4.fw.orig +++ b/test/pf/firewall10-4.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:39 2011 PST by vadim +# Generated Fri Feb 11 12:26:37 2011 PST by vadim # # files: * firewall10-4.fw /etc/fw/firewall10-4.fw # files: firewall10-4.conf /etc/fw/firewall10-4.conf @@ -29,7 +29,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Feb 10 12:17:39 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:37 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 86453fc9d..ce3e287be 100755 --- a/test/pf/firewall10-5.fw.orig +++ b/test/pf/firewall10-5.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:41 2011 PST by vadim +# Generated Fri Feb 11 12:26:39 2011 PST by vadim # # files: * firewall10-5.fw /etc/fw/firewall10-5.fw # files: firewall10-5.conf /etc/fw/firewall10-5.conf @@ -30,7 +30,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Feb 10 12:17:41 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:39 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 b95353261..da147ab89 100755 --- a/test/pf/firewall10-6.fw.orig +++ b/test/pf/firewall10-6.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:42 2011 PST by vadim +# Generated Fri Feb 11 12:26:40 2011 PST by vadim # # files: * firewall10-6.fw /etc/fw/firewall10-6.fw # files: firewall10-6.conf /etc/fw/firewall10-6.conf @@ -30,7 +30,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Feb 10 12:17:42 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:40 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall100.fw.orig b/test/pf/firewall100.fw.orig index 5672c95c7..69a258485 100755 --- a/test/pf/firewall100.fw.orig +++ b/test/pf/firewall100.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:34 2011 PST by vadim +# Generated Fri Feb 11 12:26:32 2011 PST by vadim # # files: * firewall100.fw /etc/fw/pf.fw # files: firewall100.conf /etc/fw/path\ with\ space/pf.conf @@ -28,7 +28,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -160,7 +160,7 @@ configure_interfaces() { update_addresses_of_interface "em1 10.1.1.81/0xffffff00" "" } -log "Activating firewall script generated Thu Feb 10 12:17:34 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:32 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall101.fw.orig b/test/pf/firewall101.fw.orig index 973e03014..7b28960b3 100755 --- a/test/pf/firewall101.fw.orig +++ b/test/pf/firewall101.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:34 2011 PST by vadim +# Generated Fri Feb 11 12:26:32 2011 PST by vadim # # files: * firewall101.fw /etc/fw/pf.fw # files: firewall101.conf /etc/fw/path\ with\ space/pf.conf @@ -31,7 +31,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -163,7 +163,7 @@ configure_interfaces() { update_addresses_of_interface "em1 10.1.1.81/0xffffff00" "" } -log "Activating firewall script generated Thu Feb 10 12:17:34 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:32 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall102.fw.orig b/test/pf/firewall102.fw.orig index 6fb9b0bd3..4e5071865 100755 --- a/test/pf/firewall102.fw.orig +++ b/test/pf/firewall102.fw.orig @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:35 2011 PST by vadim +# Generated Fri Feb 11 12:26:33 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 baf8bba03..c980ec802 100755 --- a/test/pf/firewall103-1.fw.orig +++ b/test/pf/firewall103-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:38 2011 PST by vadim +# Generated Fri Feb 11 12:26:36 2011 PST by vadim # # files: * firewall103-1.fw /etc/fw/pf.fw # files: firewall103-1.conf /etc/fw/path\ with\ space/pf.conf @@ -26,7 +26,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -372,9 +372,9 @@ configure_interfaces() { : sync_vlan_interfaces sync_bridge_interfaces bridge0 - update_bridge_interface bridge0 "em2 em3" sync_carp_interfaces sync_pfsync_interfaces + update_bridge_interface bridge0 "em2 em3" update_addresses_of_interface "bridge0 192.168.1.1/0xffffff00" "" update_addresses_of_interface "em0 10.3.14.81/0xffffff00" "" update_addresses_of_interface "em1 10.1.1.81/0xffffff00" "" @@ -382,7 +382,7 @@ configure_interfaces() { update_addresses_of_interface "em3" "" } -log "Activating firewall script generated Thu Feb 10 12:17:38 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:36 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 d8819d149..bc6999dec 100755 --- a/test/pf/firewall103-2.fw.orig +++ b/test/pf/firewall103-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:38 2011 PST by vadim +# Generated Fri Feb 11 12:26:36 2011 PST by vadim # # files: * firewall103-2.fw /etc/fw/pf.fw # files: firewall103-2.conf /etc/fw/path\ with\ space/pf.conf @@ -26,7 +26,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -372,9 +372,9 @@ configure_interfaces() { : sync_vlan_interfaces sync_bridge_interfaces bridge0 - update_bridge_interface bridge0 "em2 em3" sync_carp_interfaces sync_pfsync_interfaces + update_bridge_interface bridge0 "em2 em3" update_addresses_of_interface "bridge0 192.168.1.1/0xffffff00" "" update_addresses_of_interface "em0 10.3.14.81/0xffffff00" "" update_addresses_of_interface "em1 10.1.1.81/0xffffff00" "" @@ -382,7 +382,7 @@ configure_interfaces() { update_addresses_of_interface "em3" "" } -log "Activating firewall script generated Thu Feb 10 12:17:38 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:36 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall103.fw.orig b/test/pf/firewall103.fw.orig index f94ca60de..3f71f19a2 100755 --- a/test/pf/firewall103.fw.orig +++ b/test/pf/firewall103.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:37 2011 PST by vadim +# Generated Fri Feb 11 12:26:34 2011 PST by vadim # # files: * firewall103.fw /etc/fw/pf.fw # files: firewall103.conf /etc/fw/path\ with\ space/pf.conf @@ -29,7 +29,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -375,9 +375,9 @@ configure_interfaces() { : sync_vlan_interfaces sync_bridge_interfaces bridge0 - update_bridge_interface bridge0 "em2 em3" sync_carp_interfaces sync_pfsync_interfaces + update_bridge_interface bridge0 "em2 em3" update_addresses_of_interface "bridge0 192.168.1.1/0xffffff00" "" update_addresses_of_interface "em0 10.3.14.81/0xffffff00" "" update_addresses_of_interface "em1 10.1.1.81/0xffffff00" "" @@ -385,7 +385,7 @@ configure_interfaces() { update_addresses_of_interface "em3" "" } -log "Activating firewall script generated Thu Feb 10 12:17:37 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:34 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 5e1b85f0d..fc40d84a3 100755 --- a/test/pf/firewall104-1.fw.orig +++ b/test/pf/firewall104-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:40 2011 PST by vadim +# Generated Fri Feb 11 12:26:38 2011 PST by vadim # # files: * firewall104-1.fw /etc/fw/pf.fw # files: firewall104-1.conf /etc/fw/path\ with\ space/pf.conf @@ -26,7 +26,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -372,16 +372,16 @@ configure_interfaces() { : sync_vlan_interfaces sync_bridge_interfaces bridge0 - update_bridge_interface bridge0 "em2 em3" sync_carp_interfaces sync_pfsync_interfaces + update_bridge_interface bridge0 "em2 em3" update_addresses_of_interface "em0 10.3.14.81/0xffffff00" "" update_addresses_of_interface "em1 10.1.1.81/0xffffff00" "" update_addresses_of_interface "em2" "" update_addresses_of_interface "em3" "" } -log "Activating firewall script generated Thu Feb 10 12:17:40 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:38 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall104.fw.orig b/test/pf/firewall104.fw.orig index a81c41461..d8c3c72c3 100755 --- a/test/pf/firewall104.fw.orig +++ b/test/pf/firewall104.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:39 2011 PST by vadim +# Generated Fri Feb 11 12:26:37 2011 PST by vadim # # files: * firewall104.fw /etc/fw/pf.fw # files: firewall104.conf /etc/fw/path\ with\ space/pf.conf @@ -29,7 +29,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -375,16 +375,16 @@ configure_interfaces() { : sync_vlan_interfaces sync_bridge_interfaces bridge0 - update_bridge_interface bridge0 "em2 em3" sync_carp_interfaces sync_pfsync_interfaces + update_bridge_interface bridge0 "em2 em3" update_addresses_of_interface "em0 10.3.14.81/0xffffff00" "" update_addresses_of_interface "em1 10.1.1.81/0xffffff00" "" update_addresses_of_interface "em2" "" update_addresses_of_interface "em3" "" } -log "Activating firewall script generated Thu Feb 10 12:17:39 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:37 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall105.fw.orig b/test/pf/firewall105.fw.orig index 889ae595a..c01bf735f 100755 --- a/test/pf/firewall105.fw.orig +++ b/test/pf/firewall105.fw.orig @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:40 2011 PST by vadim +# Generated Fri Feb 11 12:26:38 2011 PST by vadim # # files: * firewall105.fw /etc/fw/pf.fw # files: firewall105.conf /etc/fw/path\ with\ space/pf.conf @@ -19,14 +19,14 @@ gateway_enable="YES" cloned_interfaces="bridge0" - network_interfaces="bridge0 em0 em1" -pfsync_enable="YES" + ifconfig_bridge0="addm em2 stp em2 addm em3 stp em3 up 192.168.1.1 netmask 0xffffff00" ifconfig_em0="10.3.14.81 netmask 0xffffff00" ifconfig_em1="10.1.1.81 netmask 0xffffff00" ifconfig_em2="up" ifconfig_em3="up" +pfsync_enable="YES" pf_enable="YES" pf_rules="/etc/fw/path\ with\ space/pf.conf" diff --git a/test/pf/firewall106.fw.orig b/test/pf/firewall106.fw.orig index 66906737a..ae66b1ee5 100755 --- a/test/pf/firewall106.fw.orig +++ b/test/pf/firewall106.fw.orig @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:42 2011 PST by vadim +# Generated Fri Feb 11 12:26:39 2011 PST by vadim # # files: * firewall106.fw /etc/fw/pf.fw # files: firewall106.conf /etc/fw/path\ with\ space/pf.conf @@ -21,14 +21,14 @@ gateway_enable="YES" cloned_interfaces="bridge0" - network_interfaces="bridge0 em0 em1" -pfsync_enable="YES" + ifconfig_bridge0="addm em2 stp em2 addm em3 stp em3 up DHCP" ifconfig_em0="10.3.14.81 netmask 0xffffff00" ifconfig_em1="10.1.1.81 netmask 0xffffff00" ifconfig_em2="up" ifconfig_em3="up" +pfsync_enable="YES" pf_enable="YES" pf_rules="/etc/fw/path\ with\ space/pf.conf" diff --git a/test/pf/firewall107.fw.orig b/test/pf/firewall107.fw.orig index 2e98efba3..88afec8db 100755 --- a/test/pf/firewall107.fw.orig +++ b/test/pf/firewall107.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:43 2011 PST by vadim +# Generated Fri Feb 11 12:26:40 2011 PST by vadim # # files: * firewall107.fw /etc/fw/pf.fw # files: firewall107.conf /etc/fw/path\ with\ space/pf.conf @@ -29,7 +29,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -374,18 +374,18 @@ run_epilog_and_exit() { configure_interfaces() { : sync_vlan_interfaces vlan101 vlan102 - update_vlans_of_interface "em2 vlan101 vlan102" sync_bridge_interfaces sync_carp_interfaces sync_pfsync_interfaces update_addresses_of_interface "em0 10.3.14.81/0xffffff00" "" update_addresses_of_interface "em1 10.1.1.81/0xffffff00" "" + update_vlans_of_interface "em2 vlan101 vlan102" update_addresses_of_interface "em2" "" update_addresses_of_interface "vlan101 192.168.101.1/0xffffff00" "" update_addresses_of_interface "vlan102 192.168.102.1/0xffffff00" "" } -log "Activating firewall script generated Thu Feb 10 12:17:43 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:40 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall108.fw.orig b/test/pf/firewall108.fw.orig index 757b59ee1..9cb66e222 100755 --- a/test/pf/firewall108.fw.orig +++ b/test/pf/firewall108.fw.orig @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:43 2011 PST by vadim +# Generated Fri Feb 11 12:26:41 2011 PST by vadim # # files: * firewall108.fw /etc/fw/pf.fw # files: firewall108.conf /etc/fw/path\ with\ space/pf.conf @@ -19,13 +19,13 @@ gateway_enable="YES" cloned_interfaces="vlan101 vlan102" +network_interfaces="em0 em1 vlan101 vlan102" +ifconfig_em0="10.3.14.81 netmask 0xffffff00" +ifconfig_em1="10.1.1.81 netmask 0xffffff00" vlans_em2="vlan101 vlan102" create_args_vlan101="vlan 101 vlandev em2" create_args_vlan102="vlan 102 vlandev em2" -network_interfaces="em0 em1 vlan101 vlan102" pfsync_enable="YES" -ifconfig_em0="10.3.14.81 netmask 0xffffff00" -ifconfig_em1="10.1.1.81 netmask 0xffffff00" ifconfig_vlan101="192.168.101.1 netmask 0xffffff00" ifconfig_vlan102="192.168.102.1 netmask 0xffffff00" diff --git a/test/pf/firewall11.fw.orig b/test/pf/firewall11.fw.orig index fc19cfeef..c311b9384 100755 --- a/test/pf/firewall11.fw.orig +++ b/test/pf/firewall11.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:44 2011 PST by vadim +# Generated Fri Feb 11 12:26:41 2011 PST by vadim # # files: * firewall11.fw /etc/firewall11.fw # files: firewall11.conf /etc/firewall11.conf @@ -30,7 +30,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Feb 10 12:17:44 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:41 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall12.fw.orig b/test/pf/firewall12.fw.orig index 94fa82c83..adafdead3 100755 --- a/test/pf/firewall12.fw.orig +++ b/test/pf/firewall12.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:44 2011 PST by vadim +# Generated Fri Feb 11 12:26:42 2011 PST by vadim # # files: * firewall12.fw /etc/fw/firewall12.fw # files: firewall12.conf /etc/fw/firewall12.conf @@ -26,7 +26,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -159,7 +159,7 @@ configure_interfaces() { update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Feb 10 12:17:44 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:42 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall13.fw.orig b/test/pf/firewall13.fw.orig index 21b749ef2..59158a721 100755 --- a/test/pf/firewall13.fw.orig +++ b/test/pf/firewall13.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:45 2011 PST by vadim +# Generated Fri Feb 11 12:26:42 2011 PST by vadim # # files: * firewall13.fw /etc/fw/firewall13.fw # files: firewall13.conf /etc/fw/firewall13.conf @@ -37,7 +37,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -88,7 +88,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Feb 10 12:17:45 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:42 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 d1b6505cf..6dc28ed99 100755 --- a/test/pf/firewall14-1.fw.orig +++ b/test/pf/firewall14-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:46 2011 PST by vadim +# Generated Fri Feb 11 12:26:44 2011 PST by vadim # # files: * firewall14-1.fw /etc/firewall14-1.fw # files: firewall14-1.conf /etc/firewall14-1.conf @@ -26,7 +26,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -241,7 +241,7 @@ configure_interfaces() { update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" "" } -log "Activating firewall script generated Thu Feb 10 12:17:46 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:44 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall14.fw.orig b/test/pf/firewall14.fw.orig index 33d885673..a64931613 100755 --- a/test/pf/firewall14.fw.orig +++ b/test/pf/firewall14.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:46 2011 PST by vadim +# Generated Fri Feb 11 12:26:43 2011 PST by vadim # # files: * firewall14.fw /etc/firewall14.fw # files: firewall14.conf /etc/firewall14.conf @@ -26,7 +26,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -241,7 +241,7 @@ configure_interfaces() { update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" "" } -log "Activating firewall script generated Thu Feb 10 12:17:46 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:43 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 5a44ea641..bd7d09cca 100755 --- a/test/pf/firewall2-1.fw.orig +++ b/test/pf/firewall2-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:48 2011 PST by vadim +# Generated Fri Feb 11 12:26:46 2011 PST by vadim # # files: * firewall2-1.fw /etc/fw/firewall2-1.fw # files: firewall2-1.conf /etc/fw/firewall2-1.conf @@ -41,7 +41,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -88,7 +88,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Feb 10 12:17:48 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:46 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall2.fw.orig b/test/pf/firewall2.fw.orig index 2515b9605..6f0ede760 100755 --- a/test/pf/firewall2.fw.orig +++ b/test/pf/firewall2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:47 2011 PST by vadim +# Generated Fri Feb 11 12:26:44 2011 PST by vadim # # files: * firewall2.fw /etc/fw/firewall2.fw # files: firewall2.conf /etc/fw/firewall2.conf @@ -26,7 +26,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Feb 10 12:17:47 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:44 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall20.fw.orig b/test/pf/firewall20.fw.orig index b21f41aa3..a2ee3a3d4 100755 --- a/test/pf/firewall20.fw.orig +++ b/test/pf/firewall20.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:47 2011 PST by vadim +# Generated Fri Feb 11 12:26:45 2011 PST by vadim # # files: * firewall20.fw /etc/fw/firewall20.fw # files: firewall20.conf /etc/fw/firewall20.conf @@ -26,7 +26,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Feb 10 12:17:47 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:45 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall21.fw.orig b/test/pf/firewall21.fw.orig index 8ef1532f3..0f58dff66 100755 --- a/test/pf/firewall21.fw.orig +++ b/test/pf/firewall21.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:48 2011 PST by vadim +# Generated Fri Feb 11 12:26:45 2011 PST by vadim # # files: * firewall21.fw /etc/fw/firewall21.fw # files: firewall21.conf /etc/fw/firewall21.conf @@ -34,7 +34,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -81,7 +81,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Feb 10 12:17:48 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:45 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall22.fw.orig b/test/pf/firewall22.fw.orig index 85218df5a..12de163a2 100755 --- a/test/pf/firewall22.fw.orig +++ b/test/pf/firewall22.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:49 2011 PST by vadim +# Generated Fri Feb 11 12:26:46 2011 PST by vadim # # files: * firewall22.fw /etc/fw/firewall22.fw # files: firewall22.conf /etc/fw/firewall22.conf @@ -33,7 +33,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -80,7 +80,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Feb 10 12:17:49 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:46 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall3.fw.orig b/test/pf/firewall3.fw.orig index 3b92dd683..2452a65cc 100755 --- a/test/pf/firewall3.fw.orig +++ b/test/pf/firewall3.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:50 2011 PST by vadim +# Generated Fri Feb 11 12:26:47 2011 PST by vadim # # files: * firewall3.fw /etc/firewall3.fw # files: firewall3.conf /etc/firewall3.conf @@ -26,7 +26,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -159,7 +159,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Feb 10 12:17:50 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:47 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall33.conf.orig b/test/pf/firewall33.conf.orig index 23e568df9..6ada3a049 100644 --- a/test/pf/firewall33.conf.orig +++ b/test/pf/firewall33.conf.orig @@ -6,7 +6,7 @@ table { 157.166.224.25 , 157.166.224.26 , 157.166.226.25 , 157.166.226.26 , 157.166.255.18 , 157.166.255.19 } table { www.google.com , 157.166.224.25 , 157.166.224.26 , 157.166.226.25 , 157.166.226.26 , 157.166.255.18 , 157.166.255.19 } table { www.google.com , www.cnn.com } -table { 74.125.224.16 , 74.125.224.17 , 74.125.224.18 , 74.125.224.19 , 74.125.224.20 , 157.166.224.25 , 157.166.224.26 , 157.166.226.25 , 157.166.226.26 , 157.166.255.18 , 157.166.255.19 } +table { 74.125.224.48 , 74.125.224.49 , 74.125.224.50 , 74.125.224.51 , 74.125.224.52 , 157.166.224.25 , 157.166.224.26 , 157.166.226.25 , 157.166.226.26 , 157.166.255.18 , 157.166.255.19 } # # Rule 0 (NAT) diff --git a/test/pf/firewall33.fw.orig b/test/pf/firewall33.fw.orig index aacf7825a..205aac5e1 100755 --- a/test/pf/firewall33.fw.orig +++ b/test/pf/firewall33.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:51 2011 PST by vadim +# Generated Fri Feb 11 12:26:48 2011 PST by vadim # # files: * firewall33.fw /etc/fw/firewall33.fw # files: firewall33.conf /etc/fw/firewall33.conf @@ -30,7 +30,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -162,7 +162,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Feb 10 12:17:51 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:48 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall34.fw.orig b/test/pf/firewall34.fw.orig index 1565cedec..71119cecc 100755 --- a/test/pf/firewall34.fw.orig +++ b/test/pf/firewall34.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:51 2011 PST by vadim +# Generated Fri Feb 11 12:26:48 2011 PST by vadim # # files: * firewall34.fw /etc/fw/firewall34.fw # files: firewall34.conf /etc/fw/firewall34.conf @@ -26,7 +26,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -158,7 +158,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Feb 10 12:17:51 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:48 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall38.fw.orig b/test/pf/firewall38.fw.orig index 4fa4b7e59..80a39be26 100755 --- a/test/pf/firewall38.fw.orig +++ b/test/pf/firewall38.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:52 2011 PST by vadim +# Generated Fri Feb 11 12:26:49 2011 PST by vadim # # files: * firewall38.fw /etc/fw/firewall38.fw # files: firewall38.conf /etc/fw/firewall38.conf @@ -29,7 +29,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Feb 10 12:17:52 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:49 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall39.fw.orig b/test/pf/firewall39.fw.orig index 1b5fbdd7c..9e57cfa4c 100755 --- a/test/pf/firewall39.fw.orig +++ b/test/pf/firewall39.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:52 2011 PST by vadim +# Generated Fri Feb 11 12:26:50 2011 PST by vadim # # files: * firewall39.fw pf.fw # files: firewall39.conf pf.conf @@ -32,7 +32,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -79,7 +79,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Feb 10 12:17:52 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:50 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall4.fw.orig b/test/pf/firewall4.fw.orig index 524001faa..eb413b748 100755 --- a/test/pf/firewall4.fw.orig +++ b/test/pf/firewall4.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:53 2011 PST by vadim +# Generated Fri Feb 11 12:26:50 2011 PST by vadim # # files: * firewall4.fw pf.fw # files: firewall4.conf /etc/fw/pf.conf @@ -30,7 +30,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Feb 10 12:17:53 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:50 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 4b4fc399d..780b04d1f 100755 --- a/test/pf/firewall40-1.fw.orig +++ b/test/pf/firewall40-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:54 2011 PST by vadim +# Generated Fri Feb 11 12:26:51 2011 PST by vadim # # files: * firewall40-1.fw /etc/firewall40-1.fw # files: firewall40-1.conf /etc/firewall40-1.conf @@ -42,7 +42,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -176,7 +176,7 @@ configure_interfaces() { update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Feb 10 12:17:54 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:51 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall40.fw.orig b/test/pf/firewall40.fw.orig index 0747422b1..1cec4aaaf 100755 --- a/test/pf/firewall40.fw.orig +++ b/test/pf/firewall40.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:53 2011 PST by vadim +# Generated Fri Feb 11 12:26:51 2011 PST by vadim # # files: * firewall40.fw /etc/firewall40.fw # files: firewall40.conf /etc/firewall40.conf @@ -26,7 +26,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -160,7 +160,7 @@ configure_interfaces() { update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Feb 10 12:17:53 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:51 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall41.fw.orig b/test/pf/firewall41.fw.orig index d50bcfc92..fce718940 100755 --- a/test/pf/firewall41.fw.orig +++ b/test/pf/firewall41.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:55 2011 PST by vadim +# Generated Fri Feb 11 12:26:52 2011 PST by vadim # # files: * firewall41.fw /etc/firewall41.fw # files: firewall41.conf /etc/firewall41.conf @@ -31,7 +31,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -163,7 +163,7 @@ configure_interfaces() { update_addresses_of_interface "eth1 2.2.2.2/0xffffff00" "" } -log "Activating firewall script generated Thu Feb 10 12:17:55 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:52 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall5.fw.orig b/test/pf/firewall5.fw.orig index 9791d0aeb..20eaf6d24 100755 --- a/test/pf/firewall5.fw.orig +++ b/test/pf/firewall5.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:55 2011 PST by vadim +# Generated Fri Feb 11 12:26:52 2011 PST by vadim # # files: * firewall5.fw /etc/fw/firewall5.fw # files: firewall5.conf /etc/fw/firewall5.conf @@ -26,7 +26,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Feb 10 12:17:55 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:52 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall51.fw.orig b/test/pf/firewall51.fw.orig index 18fd5c33f..b57441c63 100755 --- a/test/pf/firewall51.fw.orig +++ b/test/pf/firewall51.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:56 2011 PST by vadim +# Generated Fri Feb 11 12:26:54 2011 PST by vadim # # files: * firewall51.fw /etc/fw/firewall51.fw # files: firewall51.conf /etc/fw/firewall51.conf @@ -33,7 +33,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -80,7 +80,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Feb 10 12:17:56 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:54 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall6.fw.orig b/test/pf/firewall6.fw.orig index e8a168e9e..5008d4da9 100755 --- a/test/pf/firewall6.fw.orig +++ b/test/pf/firewall6.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:57 2011 PST by vadim +# Generated Fri Feb 11 12:26:53 2011 PST by vadim # # files: * firewall6.fw /etc/fw/firewall6.fw # files: firewall6.conf /etc/fw/firewall6.conf @@ -26,7 +26,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Feb 10 12:17:57 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:53 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall62.fw.orig b/test/pf/firewall62.fw.orig index 510bf0027..7cf8e76e1 100755 --- a/test/pf/firewall62.fw.orig +++ b/test/pf/firewall62.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:57 2011 PST by vadim +# Generated Fri Feb 11 12:26:54 2011 PST by vadim # # files: * firewall62.fw /etc/firewall62.fw # files: firewall62.conf /etc/firewall62.conf @@ -53,7 +53,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -185,7 +185,7 @@ configure_interfaces() { update_addresses_of_interface "en1 222.222.222.222/0xffffff00" "" } -log "Activating firewall script generated Thu Feb 10 12:17:57 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:54 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall63.fw.orig b/test/pf/firewall63.fw.orig index 997d3ea9d..8f3ae8321 100755 --- a/test/pf/firewall63.fw.orig +++ b/test/pf/firewall63.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:58 2011 PST by vadim +# Generated Fri Feb 11 12:26:55 2011 PST by vadim # # files: * firewall63.fw /etc/fw/firewall63.fw # files: firewall63.conf /etc/fw/firewall63.conf @@ -26,7 +26,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Feb 10 12:17:58 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:55 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall7.fw.orig b/test/pf/firewall7.fw.orig index 588df2beb..92a7724e4 100755 --- a/test/pf/firewall7.fw.orig +++ b/test/pf/firewall7.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:59 2011 PST by vadim +# Generated Fri Feb 11 12:26:55 2011 PST by vadim # # files: * firewall7.fw /etc/fw/firewall7.fw # files: firewall7.conf /etc/fw/firewall7.conf @@ -26,7 +26,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Feb 10 12:17:59 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:55 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall70.fw.orig b/test/pf/firewall70.fw.orig index 038f64135..d4e08b0cb 100755 --- a/test/pf/firewall70.fw.orig +++ b/test/pf/firewall70.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:17:59 2011 PST by vadim +# Generated Fri Feb 11 12:26:56 2011 PST by vadim # # files: * firewall70.fw /etc/fw/firewall70.fw # files: firewall70.conf /etc/fw/firewall70.conf @@ -31,7 +31,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -82,7 +82,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Feb 10 12:17:59 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:56 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall8.fw.orig b/test/pf/firewall8.fw.orig index 21ad998fd..ee50609ab 100755 --- a/test/pf/firewall8.fw.orig +++ b/test/pf/firewall8.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:18:00 2011 PST by vadim +# Generated Fri Feb 11 12:26:56 2011 PST by vadim # # files: * firewall8.fw /etc/firewall8.fw # files: firewall8.conf /etc/firewall8.conf @@ -25,7 +25,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -72,7 +72,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Feb 10 12:18:00 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:56 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 53798200a..0aa9b96d8 100755 --- a/test/pf/firewall80-4.5.fw.orig +++ b/test/pf/firewall80-4.5.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:18:01 2011 PST by vadim +# Generated Fri Feb 11 12:26:58 2011 PST by vadim # # files: * firewall80-4.5.fw /etc/firewall80-4.5.fw # files: firewall80-4.5.conf /etc/firewall80-4.5.conf @@ -26,7 +26,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Feb 10 12:18:01 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:58 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall80.fw.orig b/test/pf/firewall80.fw.orig index cee0c0e7d..b940f934b 100755 --- a/test/pf/firewall80.fw.orig +++ b/test/pf/firewall80.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:18:00 2011 PST by vadim +# Generated Fri Feb 11 12:26:57 2011 PST by vadim # # files: * firewall80.fw /etc/firewall80.fw # files: firewall80.conf /etc/firewall80.conf @@ -26,7 +26,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Feb 10 12:18:00 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:57 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall9.fw.orig b/test/pf/firewall9.fw.orig index 72789e230..b6ccba5b7 100755 --- a/test/pf/firewall9.fw.orig +++ b/test/pf/firewall9.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:18:01 2011 PST by vadim +# Generated Fri Feb 11 12:26:58 2011 PST by vadim # # files: * firewall9.fw /etc/fw/firewall9.fw # files: firewall9.conf /etc/fw/firewall9.conf @@ -29,7 +29,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Thu Feb 10 12:18:01 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:58 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall91.fw.orig b/test/pf/firewall91.fw.orig index a7546e2ab..c34d3ef6d 100755 --- a/test/pf/firewall91.fw.orig +++ b/test/pf/firewall91.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:18:02 2011 PST by vadim +# Generated Fri Feb 11 12:26:59 2011 PST by vadim # # files: * firewall91.fw /etc/fw/pf.fw # files: firewall91.conf /etc/fw/pf.conf @@ -25,7 +25,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -240,7 +240,7 @@ configure_interfaces() { update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" "" } -log "Activating firewall script generated Thu Feb 10 12:18:02 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:59 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall92.fw.orig b/test/pf/firewall92.fw.orig index 9b9c6d776..293a82fde 100755 --- a/test/pf/firewall92.fw.orig +++ b/test/pf/firewall92.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:18:02 2011 PST by vadim +# Generated Fri Feb 11 12:26:59 2011 PST by vadim # # files: * firewall92.fw /etc/fw/pf.fw # files: firewall92.conf /etc/fw/path\ with\ space/pf.conf @@ -28,7 +28,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -160,7 +160,7 @@ configure_interfaces() { update_addresses_of_interface "em1 10.1.1.81/0xffffff00" "" } -log "Activating firewall script generated Thu Feb 10 12:18:02 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:26:59 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_1_openbsd-1.fw.orig b/test/pf/pf_cluster_1_openbsd-1.fw.orig index a23925319..033428195 100755 --- a/test/pf/pf_cluster_1_openbsd-1.fw.orig +++ b/test/pf/pf_cluster_1_openbsd-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:18:05 2011 PST by vadim +# Generated Fri Feb 11 12:56:32 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 @@ -25,7 +25,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -277,19 +277,20 @@ configure_interfaces() { : sync_vlan_interfaces sync_carp_interfaces carp0 carp1 - $IFCONFIG carp0 vhid 101 pass secret carpdev en0 - $IFCONFIG carp1 vhid 100 pass secret carpdev en1 sync_pfsync_interfaces pfsync0 - $IFCONFIG pfsync0 syncdev en0 syncpeer 172.24.0.3 - $IFCONFIG pfsync0 up + $IFCONFIG carp0 vhid 101 pass secret carpdev en0 update_addresses_of_interface "carp0 172.24.0.1/0xffffff00" "" + $IFCONFIG carp1 vhid 100 pass secret carpdev en1 update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" update_addresses_of_interface "en0 172.24.0.2/0xffffff00 172.24.0.3/0xffffff00" "" + $IFCONFIG pfsync0 syncdev en0 syncpeer 172.24.0.3 + $IFCONFIG pfsync0 up update_addresses_of_interface "en1 192.168.1.2/0xffffff00" "" update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" + update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Feb 10 12:18:05 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:56:32 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 0489587e9..c658e45d9 100755 --- a/test/pf/pf_cluster_1_openbsd-2.fw.orig +++ b/test/pf/pf_cluster_1_openbsd-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:18:05 2011 PST by vadim +# Generated Fri Feb 11 12:56:32 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 @@ -25,7 +25,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -178,15 +178,16 @@ configure_interfaces() { : sync_carp_interfaces carp0 carp1 $IFCONFIG carp0 vhid 101 pass secret advskew 1 carpdev en0 - $IFCONFIG carp1 vhid 100 pass secret advskew 1 carpdev en1 update_addresses_of_interface "carp0 172.24.0.1/0xffffff00" "" + $IFCONFIG carp1 vhid 100 pass secret advskew 1 carpdev en1 update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" update_addresses_of_interface "en0 172.24.0.3/0xffffff00 172.24.0.2/0xffffff00" "" update_addresses_of_interface "en1 192.168.1.3/0xffffff00" "" update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" + update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Thu Feb 10 12:18:05 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:56:32 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 0d2855670..88da334b9 100755 --- a/test/pf/pf_cluster_2_freebsd-1.fw.orig +++ b/test/pf/pf_cluster_2_freebsd-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:18:05 2011 PST by vadim +# Generated Fri Feb 11 12:56:32 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 @@ -28,7 +28,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -280,18 +280,18 @@ configure_interfaces() { : sync_vlan_interfaces sync_carp_interfaces carp0 carp1 - $IFCONFIG carp0 vhid 101 pass secret advskew 5 carpdev en0 - $IFCONFIG carp1 vhid 100 pass secret advskew 5 carpdev en1 sync_pfsync_interfaces pfsync0 - $IFCONFIG pfsync0 syncdev en0 - $IFCONFIG pfsync0 up + $IFCONFIG carp0 vhid 101 pass secret advskew 5 carpdev en0 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 update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" update_addresses_of_interface "en0 172.24.0.2/0xffffff00" "" + $IFCONFIG pfsync0 syncdev en0 + $IFCONFIG pfsync0 up update_addresses_of_interface "en1 192.168.1.2/0xffffff00" "" } -log "Activating firewall script generated Thu Feb 10 12:18:05 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:56:32 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 5127ad389..8a2fd0e91 100755 --- a/test/pf/pf_cluster_2_freebsd-2.fw.orig +++ b/test/pf/pf_cluster_2_freebsd-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:18:05 2011 PST by vadim +# Generated Fri Feb 11 12:56:32 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 @@ -28,7 +28,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -181,14 +181,14 @@ configure_interfaces() { : sync_carp_interfaces carp0 carp1 $IFCONFIG carp0 vhid 101 pass secret advskew 10 carpdev en0 - $IFCONFIG carp1 vhid 100 pass secret advskew 10 carpdev en1 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 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 Thu Feb 10 12:18:05 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:56:32 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 887f30648..c037b1b65 100755 --- a/test/pf/pf_cluster_3_openbsd-3.fw.orig +++ b/test/pf/pf_cluster_3_openbsd-3.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:18:06 2011 PST by vadim +# Generated Fri Feb 11 12:56:32 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 @@ -25,7 +25,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -276,23 +276,24 @@ run_epilog_and_exit() { configure_interfaces() { : sync_vlan_interfaces vlan100 - update_vlans_of_interface "en2 vlan100" sync_carp_interfaces carp0 carp1 carp2 - $IFCONFIG carp0 vhid 1 pass "" carpdev en0 - $IFCONFIG carp1 vhid 1 pass "" carpdev en1 - $IFCONFIG carp2 vhid 1 pass "" carpdev vlan100 sync_pfsync_interfaces + $IFCONFIG carp0 vhid 1 pass "" carpdev en0 update_addresses_of_interface "carp0 172.24.0.1/0xffffff00" "" + $IFCONFIG carp1 vhid 1 pass "" carpdev en1 update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" + $IFCONFIG carp2 vhid 1 pass "" carpdev vlan100 update_addresses_of_interface "carp2 172.20.0.1/0xffffff00" "" update_addresses_of_interface "en0 172.24.0.2/0xffffff00" "" update_addresses_of_interface "en1 192.168.1.2/0xffffff00" "" + update_vlans_of_interface "en2 vlan100" update_addresses_of_interface "en2" "" update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" + update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" update_addresses_of_interface "vlan100 172.20.0.2/0xffffff00" "" } -log "Activating firewall script generated Thu Feb 10 12:18:06 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:56:32 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 d2acd4dc8..405bcd1ac 100755 --- a/test/pf/pf_cluster_3_openbsd-4.fw.orig +++ b/test/pf/pf_cluster_3_openbsd-4.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:18:06 2011 PST by vadim +# Generated Fri Feb 11 12:56:33 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 @@ -25,7 +25,7 @@ LOGGER="/usr/bin/logger" log() { echo "$1" - test -x "$LOGGER" && $LOGGER -p info "$1" + command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1" } diff_intf() { @@ -178,19 +178,20 @@ configure_interfaces() { : sync_carp_interfaces carp0 carp1 carp2 $IFCONFIG carp0 vhid 1 pass "" advskew 1 carpdev en0 - $IFCONFIG carp1 vhid 1 pass "" advskew 1 carpdev en1 - $IFCONFIG carp2 vhid 1 pass "" advskew 1 carpdev vlan100 update_addresses_of_interface "carp0 172.24.0.1/0xffffff00" "" + $IFCONFIG carp1 vhid 1 pass "" advskew 1 carpdev en1 update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" + $IFCONFIG carp2 vhid 1 pass "" advskew 1 carpdev vlan100 update_addresses_of_interface "carp2 172.20.0.1/0xffffff00" "" update_addresses_of_interface "en0 172.24.0.3/0xffffff00" "" update_addresses_of_interface "en1 192.168.1.3/0xffffff00" "" update_addresses_of_interface "en2" "" update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" + update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" update_addresses_of_interface "vlan100 172.20.0.3/0xffffff00" "" } -log "Activating firewall script generated Thu Feb 10 12:18:06 2011 by vadim" +log "Activating firewall script generated Fri Feb 11 12:56:33 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 0cc4746ff..fd38c1c23 100755 --- a/test/pf/pf_cluster_4_rc.conf.local +++ b/test/pf/pf_cluster_4_rc.conf.local @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3469 +# Firewall Builder fwb_pf v4.2.0.3471 # -# Generated Thu Feb 10 12:18:06 2011 PST by vadim +# Generated Fri Feb 11 12:56:32 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 @@ -18,16 +18,16 @@ gateway_enable="YES" cloned_interfaces="carp0 carp1" -ifconfig_carp0="vhid 101 pass secret advskew 10 carpdev en0" -ifconfig_carp1="vhid 100 pass secret advskew 10 carpdev en1" network_interfaces="carp0 carp1 en0 en1" -pfsync_enable="YES" +ifconfig_carp0="vhid 101 pass secret advskew 10 carpdev en0" +ifconfig_carp0="172.24.0.1 netmask 0xffffff00" +ifconfig_carp1="vhid 100 pass secret advskew 10 carpdev en1" +ifconfig_carp1="192.168.1.1 netmask 0xffffff00" pfsync_syncdev="en0" pfsync_syncpeer="172.24.0.2" -ifconfig_carp0="172.24.0.1 netmask 0xffffff00" -ifconfig_carp1="192.168.1.1 netmask 0xffffff00" ifconfig_en0="172.24.0.3 netmask 0xffffff00" ifconfig_en1="192.168.1.3 netmask 0xffffff00" +pfsync_enable="YES" pf_enable="YES" pf_rules="/etc/pf_cluster_4_pf.conf"