onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-23 19:57:21 +01:00
Code Issues Releases Wiki Activity

see #1807, #2104 arrange interface configuration commands in the

Browse Source 
generated scritpt in such order that bridge and carp interfaces
are configured after all other interfaces are done.
This commit is contained in:
Vadim Kurland 2011-02-16 14:42:06 -08:00
parent 25c1ed5d6b
commit a58445ed16
76 changed files with 318 additions and 293 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -7,7 +7,7 @@ FWB_MICRO_VERSION=0
# build number is like "nano" version number. I am incrementing build
# number during development cycle
#
BUILD_NUM="3478"
BUILD_NUM="3479"
VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"

2
VERSION.h
View File

@ -1,2 +1,2 @@
#define VERSION "4.2.0.3478"
#define VERSION "4.2.0.3479"
#define GENERATION "4.2"

5
doc/ChangeLog
View File

@ -1,5 +1,10 @@
2011-02-16 vadim <vadim@netcitadel.com>
* OSConfigurator_bsd_interfaces.cpp (sort_interface_names): see
#1807, #2104: arrange interface configuration commands in the
generated scritpt in such order that bridge and carp interfaces
are configured after all other interfaces are done.
* compiler_lib/CompilerDriver.cpp (commonChecks2): see #2103
removed interface name validation check in compilers, this
check will only be done in the GUI. Comiler still verifies

2
packaging/fwbuilder-static-qt.spec
View File

@ -3,7 +3,7 @@
%define name fwbuilder
%define version 4.2.0.3478
%define version 4.2.0.3479
%define release 1
%if "%_vendor" == "MandrakeSoft"

2
packaging/fwbuilder.control
View File

@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu
Priority: extra
Section: checkinstall
Maintainer: vadim@fwbuilder.org
Version: 4.2.0.3478-1
Version: 4.2.0.3479-1
Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15
Description: Firewall Builder GUI and policy compilers

2
packaging/fwbuilder.spec
View File

@ -1,6 +1,6 @@
%define name fwbuilder
%define version 4.2.0.3478
%define version 4.2.0.3479
%define release 1
%if "%_vendor" == "MandrakeSoft"

37
src/pflib/OSConfigurator_bsd_interfaces.cpp
View File

@ -50,22 +50,6 @@ using namespace fwcompiler;
using namespace std;
/*
* I need to sort interfaces by name but make sure carp interfaces are
* always last. See #1807
*/
bool compare_names(FWObject *a, FWObject *b)
{
QString a_name = QString(a->getName().c_str());
QString b_name = QString(b->getName().c_str());
if (a_name.startsWith("carp") && b_name.startsWith("carp"))
return a_name < b_name;
if (a_name.startsWith("carp")) return false;
if (b_name.startsWith("carp")) return true;
return a_name < b_name;
}
string OSConfigurator_bsd::configureInterfaces()
{
FWOptions* options = fw->getOptionsObject();
@ -215,7 +199,7 @@ string OSConfigurator_bsd::configureInterfaces()
fw->getStr("host_OS")));
list<FWObject*> all_interfaces = fw->getByTypeDeep(Interface::TYPENAME);
all_interfaces.sort(compare_names);
all_interfaces.sort();
QStringList configure_intf_commands;
QStringList intf_names;
@ -630,11 +614,28 @@ void OSConfigurator_bsd::interfaceConfigLinePfsync(
interface_configuration_lines[iface->getName().c_str()] << configlet.expand();
}
/*
* I need to sort interfaces by name but make sure carp and bridge
* interfaces are always last. See #1807 and #2104
*/
bool sort_interface_names(QString a, QString b)
{
QString an = a;
QString bn = b;
if (a.startsWith("bridge")) an = "x_" + a;
if (b.startsWith("bridge")) bn = "x_" + b;
if (a.startsWith("carp")) an = "y_" + a;
if (b.startsWith("carp")) bn = "y_" + b;
if (a.startsWith("pfsync")) an = "z_" + a;
if (b.startsWith("pfsync")) bn = "z_" + b;
return an < bn;
}
QString OSConfigurator_bsd::printAllInterfaceConfigurationLines()
{
QStringList keys = interface_configuration_lines.keys();
keys.sort();
//keys.sort();
qSort(keys.begin(), keys.end(), sort_interface_names);
QStringList res;
foreach (QString iface, keys)
res << interface_configuration_lines[iface].join("\n");

6
test/pf/firewall-base-rulesets.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:25:07 2011 PST by vadim
# Generated Wed Feb 16 14:33:37 2011 PST by vadim
#
# files: * firewall-base-rulesets.fw /etc/fw/firewall-base-rulesets.fw
# files: firewall-base-rulesets.conf /etc/fw/firewall-base-rulesets.conf
@ -163,7 +163,7 @@ configure_interfaces() {
update_addresses_of_interface "en2 192.168.100.1/0xffffff00" ""
}
log "Activating firewall script generated Wed Feb 16 13:25:07 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:37 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall-ipv6-1.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:25:07 2011 PST by vadim
# Generated Wed Feb 16 14:33:38 2011 PST by vadim
#
# files: * firewall-ipv6-1.fw pf-ipv6.fw
# files: firewall-ipv6-1.conf /etc/fw/pf-ipv6.conf
@ -175,7 +175,7 @@ configure_interfaces() {
update_addresses_of_interface "lo ::1/128 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Wed Feb 16 13:25:07 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:38 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall-ipv6-2.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:25:09 2011 PST by vadim
# Generated Wed Feb 16 14:33:39 2011 PST by vadim
#
# files: * firewall-ipv6-2.fw pf.fw
# files: firewall-ipv6-2.conf pf.conf
@ -179,7 +179,7 @@ configure_interfaces() {
update_addresses_of_interface "lo ::1/128 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Wed Feb 16 13:25:09 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:39 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall-ipv6-3.fw.orig
View File

@ -1,9 +1,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:25:09 2011 PST by vadim
# Generated Wed Feb 16 14:33:39 2011 PST by vadim
#
# files: * firewall-ipv6-3.fw /etc/firewall-ipv6-3.fw
# files: firewall-ipv6-3.conf /etc/firewall-ipv6-3.conf
@ -33,9 +33,9 @@ create_args_vlan100="vlan 100 vlandev ed1"
create_args_vlan101="vlan 101 vlandev ed1"
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"
pfsync_enable="YES"
pf_enable="YES"
pf_rules="/etc/firewall-ipv6-3.conf"

6
test/pf/firewall.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:33 2011 PST by vadim
# Generated Wed Feb 16 14:33:04 2011 PST by vadim
#
# files: * firewall.fw /etc/pf.fw
# files: firewall.conf /etc/pf.conf
@ -167,7 +167,7 @@ configure_interfaces() {
update_addresses_of_interface "lo 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Wed Feb 16 13:24:33 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:04 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall1.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:33 2011 PST by vadim
# Generated Wed Feb 16 14:33:05 2011 PST by vadim
#
# files: * firewall1.fw /etc/fw/firewall1.fw
# files: firewall1.conf /etc/fw/firewall1.conf
@ -76,7 +76,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Wed Feb 16 13:24:33 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:05 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall10-1.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:35 2011 PST by vadim
# Generated Wed Feb 16 14:33:07 2011 PST by vadim
#
# files: * firewall10-1.fw /etc/fw/firewall10-1.fw
# files: firewall10-1.conf /etc/fw/firewall10-1.conf
@ -74,7 +74,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Wed Feb 16 13:24:35 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:07 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall10-2.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:36 2011 PST by vadim
# Generated Wed Feb 16 14:33:08 2011 PST by vadim
#
# files: * firewall10-2.fw /etc/fw/firewall10-2.fw
# files: firewall10-2.conf /etc/fw/firewall10-2.conf
@ -74,7 +74,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Wed Feb 16 13:24:36 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:08 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall10-3.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:37 2011 PST by vadim
# Generated Wed Feb 16 14:33:09 2011 PST by vadim
#
# files: * firewall10-3.fw /etc/fw/firewall10-3.fw
# files: firewall10-3.conf /etc/fw/firewall10-3.conf
@ -76,7 +76,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Wed Feb 16 13:24:37 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:09 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall10-4.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:40 2011 PST by vadim
# Generated Wed Feb 16 14:33:11 2011 PST by vadim
#
# files: * firewall10-4.fw /etc/fw/firewall10-4.fw
# files: firewall10-4.conf /etc/fw/firewall10-4.conf
@ -76,7 +76,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Wed Feb 16 13:24:40 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:11 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall10-5.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:41 2011 PST by vadim
# Generated Wed Feb 16 14:33:13 2011 PST by vadim
#
# files: * firewall10-5.fw /etc/fw/firewall10-5.fw
# files: firewall10-5.conf /etc/fw/firewall10-5.conf
@ -77,7 +77,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Wed Feb 16 13:24:41 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:13 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall10-6.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:42 2011 PST by vadim
# Generated Wed Feb 16 14:33:14 2011 PST by vadim
#
# files: * firewall10-6.fw /etc/fw/firewall10-6.fw
# files: firewall10-6.conf /etc/fw/firewall10-6.conf
@ -77,7 +77,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Wed Feb 16 13:24:42 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:14 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall100.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:34 2011 PST by vadim
# Generated Wed Feb 16 14:33:05 2011 PST by vadim
#
# files: * firewall100.fw /etc/fw/pf.fw
# files: firewall100.conf /etc/fw/path\ with\ space/pf.conf
@ -161,7 +161,7 @@ configure_interfaces() {
update_addresses_of_interface "em1 10.1.1.81/0xffffff00" ""
}
log "Activating firewall script generated Wed Feb 16 13:24:34 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:05 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall101.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:35 2011 PST by vadim
# Generated Wed Feb 16 14:33:06 2011 PST by vadim
#
# files: * firewall101.fw /etc/fw/pf.fw
# files: firewall101.conf /etc/fw/path\ with\ space/pf.conf
@ -164,7 +164,7 @@ configure_interfaces() {
update_addresses_of_interface "em1 10.1.1.81/0xffffff00" ""
}
log "Activating firewall script generated Wed Feb 16 13:24:35 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:06 2011 by vadim"
set_kernel_vars
configure_interfaces

4
test/pf/firewall102.fw.orig
View File

@ -1,9 +1,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:36 2011 PST by vadim
# Generated Wed Feb 16 14:33:07 2011 PST by vadim
#
# files: * firewall102.fw /etc/fw/pf.fw
# files: firewall102.conf /etc/fw/path\ with\ space/pf.conf

14
test/pf/firewall103-1.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:38 2011 PST by vadim
# Generated Wed Feb 16 14:33:09 2011 PST by vadim
#
# files: * firewall103-1.fw /etc/fw/pf.fw
# files: firewall103-1.conf /etc/fw/path\ with\ space/pf.conf
@ -377,17 +377,17 @@ configure_interfaces() {
sync_bridge_interfaces bridge0
sync_carp_interfaces
sync_pfsync_interfaces
update_bridge_interface bridge0 "em2 em3"
$IFCONFIG bridge0 -stp em2
$IFCONFIG bridge0 -stp 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" ""
update_addresses_of_interface "em2" ""
update_addresses_of_interface "em3" ""
update_bridge_interface bridge0 "em2 em3"
$IFCONFIG bridge0 -stp em2
$IFCONFIG bridge0 -stp em3
update_addresses_of_interface "bridge0 192.168.1.1/0xffffff00" ""
}
log "Activating firewall script generated Wed Feb 16 13:24:38 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:09 2011 by vadim"
set_kernel_vars
configure_interfaces

14
test/pf/firewall103-2.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:38 2011 PST by vadim
# Generated Wed Feb 16 14:33:10 2011 PST by vadim
#
# files: * firewall103-2.fw /etc/fw/pf.fw
# files: firewall103-2.conf /etc/fw/path\ with\ space/pf.conf
@ -377,17 +377,17 @@ configure_interfaces() {
sync_bridge_interfaces bridge0
sync_carp_interfaces
sync_pfsync_interfaces
update_bridge_interface bridge0 "em2 em3"
$IFCONFIG bridge0 -stp em2
$IFCONFIG bridge0 -stp 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" ""
update_addresses_of_interface "em2" ""
update_addresses_of_interface "em3" ""
update_bridge_interface bridge0 "em2 em3"
$IFCONFIG bridge0 -stp em2
$IFCONFIG bridge0 -stp em3
update_addresses_of_interface "bridge0 192.168.1.1/0xffffff00" ""
}
log "Activating firewall script generated Wed Feb 16 13:24:38 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:10 2011 by vadim"
set_kernel_vars
configure_interfaces

14
test/pf/firewall103.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:37 2011 PST by vadim
# Generated Wed Feb 16 14:33:08 2011 PST by vadim
#
# files: * firewall103.fw /etc/fw/pf.fw
# files: firewall103.conf /etc/fw/path\ with\ space/pf.conf
@ -380,17 +380,17 @@ configure_interfaces() {
sync_bridge_interfaces bridge0
sync_carp_interfaces
sync_pfsync_interfaces
update_bridge_interface bridge0 "em2 em3"
$IFCONFIG bridge0 -stp em2
$IFCONFIG bridge0 -stp 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" ""
update_addresses_of_interface "em2" ""
update_addresses_of_interface "em3" ""
update_bridge_interface bridge0 "em2 em3"
$IFCONFIG bridge0 -stp em2
$IFCONFIG bridge0 -stp em3
update_addresses_of_interface "bridge0 192.168.1.1/0xffffff00" ""
}
log "Activating firewall script generated Wed Feb 16 13:24:37 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:08 2011 by vadim"
set_kernel_vars
configure_interfaces

12
test/pf/firewall104-1.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:40 2011 PST by vadim
# Generated Wed Feb 16 14:33:12 2011 PST by vadim
#
# files: * firewall104-1.fw /etc/fw/pf.fw
# files: firewall104-1.conf /etc/fw/path\ with\ space/pf.conf
@ -377,16 +377,16 @@ configure_interfaces() {
sync_bridge_interfaces bridge0
sync_carp_interfaces
sync_pfsync_interfaces
update_bridge_interface bridge0 "em2 em3"
$IFCONFIG bridge0 -stp em2
$IFCONFIG bridge0 -stp 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" ""
update_bridge_interface bridge0 "em2 em3"
$IFCONFIG bridge0 -stp em2
$IFCONFIG bridge0 -stp em3
}
log "Activating firewall script generated Wed Feb 16 13:24:40 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:12 2011 by vadim"
set_kernel_vars
configure_interfaces

12
test/pf/firewall104.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:39 2011 PST by vadim
# Generated Wed Feb 16 14:33:11 2011 PST by vadim
#
# files: * firewall104.fw /etc/fw/pf.fw
# files: firewall104.conf /etc/fw/path\ with\ space/pf.conf
@ -380,16 +380,16 @@ configure_interfaces() {
sync_bridge_interfaces bridge0
sync_carp_interfaces
sync_pfsync_interfaces
update_bridge_interface bridge0 "em2 em3"
$IFCONFIG bridge0 stp em2
$IFCONFIG bridge0 stp 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" ""
update_bridge_interface bridge0 "em2 em3"
$IFCONFIG bridge0 stp em2
$IFCONFIG bridge0 stp em3
}
log "Activating firewall script generated Wed Feb 16 13:24:39 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:11 2011 by vadim"
set_kernel_vars
configure_interfaces

8
test/pf/firewall105.fw.orig
View File

@ -1,9 +1,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:41 2011 PST by vadim
# Generated Wed Feb 16 14:33:12 2011 PST by vadim
#
# files: * firewall105.fw /etc/fw/pf.fw
# files: firewall105.conf /etc/fw/path\ with\ space/pf.conf
@ -20,12 +20,12 @@ gateway_enable="YES"
cloned_interfaces="bridge0"
network_interfaces="bridge0 em0 em1"
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"
ifconfig_bridge0="addm em2 -stp em2 addm em3 -stp em3 up 192.168.1.1 netmask 0xffffff00"
pfsync_enable="YES"
pf_enable="YES"

8
test/pf/firewall106.fw.orig
View File

@ -1,9 +1,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:42 2011 PST by vadim
# Generated Wed Feb 16 14:33:13 2011 PST by vadim
#
# files: * firewall106.fw /etc/fw/pf.fw
# files: firewall106.conf /etc/fw/path\ with\ space/pf.conf
@ -22,12 +22,12 @@ gateway_enable="YES"
cloned_interfaces="bridge0"
network_interfaces="bridge0 em0 em1"
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"
ifconfig_bridge0="addm em2 stp em2 addm em3 stp em3 up DHCP"
pfsync_enable="YES"
pf_enable="YES"

6
test/pf/firewall107.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:43 2011 PST by vadim
# Generated Wed Feb 16 14:33:14 2011 PST by vadim
#
# files: * firewall107.fw /etc/fw/pf.fw
# files: firewall107.conf /etc/fw/path\ with\ space/pf.conf
@ -388,7 +388,7 @@ configure_interfaces() {
update_addresses_of_interface "vlan102 192.168.102.1/0xffffff00" ""
}
log "Activating firewall script generated Wed Feb 16 13:24:43 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:14 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall108.fw.orig
View File

@ -1,9 +1,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:44 2011 PST by vadim
# Generated Wed Feb 16 14:33:15 2011 PST by vadim
#
# files: * firewall108.fw /etc/fw/pf.fw
# files: firewall108.conf /etc/fw/path\ with\ space/pf.conf
@ -25,9 +25,9 @@ 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"
pfsync_enable="YES"
ifconfig_vlan101="192.168.101.1 netmask 0xffffff00"
ifconfig_vlan102="192.168.102.1 netmask 0xffffff00"
pfsync_enable="YES"
pf_enable="YES"
pf_rules="/etc/fw/path\ with\ space/pf.conf"

14
test/pf/firewall109-1.fw.orig
View File

@ -1,9 +1,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:45 2011 PST by vadim
# Generated Wed Feb 16 14:40:53 2011 PST by vadim
#
# files: * firewall109-1.fw /etc/fw/pf.fw
# files: firewall109-1.conf /etc/fw/path\ with\ space/pf.conf
@ -20,18 +20,18 @@ gateway_enable="YES"
cloned_interfaces="vlan101 vlan102 bridge0"
network_interfaces="bridge0 em0 vlan101 vlan102"
ifconfig_bridge0="addm em1 -stp em1 addm em2 -stp em2 up 192.168.1.1 netmask 0xffffff00"
ifconfig_em0="10.3.14.81 netmask 0xffffff00"
ifconfig_em1="up media 100baseTX mediaopt full-duplex up"
ifconfig_em1="up media 100baseTX mediaopt full-duplex"
vlans_em2="vlan101 vlan102"
create_args_vlan101="vlan 101 vlandev em2"
create_args_vlan102="vlan 102 vlandev em2"
ifconfig_em2="up media 100baseTX mediaopt full-duplex up"
pfsync_enable="YES"
ifconfig_em2="up media 100baseTX mediaopt full-duplex"
ifconfig_vlan101="192.168.101.1 netmask 0xffffff00"
ifconfig_vlan102="192.168.102.1 netmask 0xffffff00"
ifconfig_bridge0="addm em1 -stp em1 addm em2 -stp em2 up 192.168.1.1 netmask 0xffffff00"
pfsync_enable="YES"
pf_enable="YES"
pf_rules="/etc/fw/path\ with\ space/pf.conf"

14
test/pf/firewall109-2.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:45 2011 PST by vadim
# Generated Wed Feb 16 14:33:17 2011 PST by vadim
#
# files: * firewall109-2.fw /etc/fw/pf.fw
# files: firewall109-2.conf /etc/fw/path\ with\ space/pf.conf
@ -380,10 +380,6 @@ configure_interfaces() {
sync_bridge_interfaces bridge0
sync_carp_interfaces
sync_pfsync_interfaces
update_bridge_interface bridge0 "vlan8210 vlan9210"
$IFCONFIG bridge0 -stp vlan8210
$IFCONFIG bridge0 -stp vlan9210
update_addresses_of_interface "bridge0 192.168.1.1/0xffffff00" ""
update_addresses_of_interface "em0 10.3.14.81/0xffffff00" ""
update_vlans_of_interface "em1 vlan9210"
update_addresses_of_interface "em1" ""
@ -391,9 +387,13 @@ configure_interfaces() {
update_addresses_of_interface "em2" ""
update_addresses_of_interface "vlan8210" ""
update_addresses_of_interface "vlan9210" ""
update_bridge_interface bridge0 "vlan8210 vlan9210"
$IFCONFIG bridge0 -stp vlan8210
$IFCONFIG bridge0 -stp vlan9210
update_addresses_of_interface "bridge0 192.168.1.1/0xffffff00" ""
}
log "Activating firewall script generated Wed Feb 16 13:24:45 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:17 2011 by vadim"
set_kernel_vars
configure_interfaces

10
test/pf/firewall109-3.fw.orig
View File

@ -1,9 +1,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:46 2011 PST by vadim
# Generated Wed Feb 16 14:33:17 2011 PST by vadim
#
# files: * firewall109-3.fw /etc/fw/pf.fw
# files: firewall109-3.conf /etc/fw/path\ with\ space/pf.conf
@ -20,17 +20,17 @@ gateway_enable="YES"
cloned_interfaces="vlan8210 vlan9210 bridge0"
network_interfaces="bridge0 em0"
ifconfig_bridge0="addm vlan8210 -stp vlan8210 addm vlan9210 -stp vlan9210 up 192.168.1.1 netmask 0xffffff00"
ifconfig_em0="10.3.14.81 netmask 0xffffff00"
vlans_em1="vlan9210"
create_args_vlan9210="vlan 210 vlandev em1"
vlans_em2="vlan8210"
create_args_vlan8210="vlan 210 vlandev em2"
pfsync_enable="YES"
ifconfig_vlan8210="up"
ifconfig_vlan9210="up"
ifconfig_bridge0="addm vlan8210 -stp vlan8210 addm vlan9210 -stp vlan9210 up 192.168.1.1 netmask 0xffffff00"
pfsync_enable="YES"
pf_enable="YES"
pf_rules="/etc/fw/path\ with\ space/pf.conf"

14
test/pf/firewall109.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:44 2011 PST by vadim
# Generated Wed Feb 16 14:33:15 2011 PST by vadim
#
# files: * firewall109.fw /etc/fw/pf.fw
# files: firewall109.conf /etc/fw/path\ with\ space/pf.conf
@ -380,10 +380,6 @@ configure_interfaces() {
sync_bridge_interfaces bridge0
sync_carp_interfaces
sync_pfsync_interfaces
update_bridge_interface bridge0 "em1 em2"
$IFCONFIG bridge0 -stp em1
$IFCONFIG bridge0 -stp em2
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" ""
$IFCONFIG em1 media 100baseTX mediaopt full-duplex up
@ -392,9 +388,13 @@ configure_interfaces() {
$IFCONFIG em2 media 100baseTX mediaopt full-duplex up
update_addresses_of_interface "vlan101 192.168.101.1/0xffffff00" ""
update_addresses_of_interface "vlan102 192.168.102.1/0xffffff00" ""
update_bridge_interface bridge0 "em1 em2"
$IFCONFIG bridge0 -stp em1
$IFCONFIG bridge0 -stp em2
update_addresses_of_interface "bridge0 192.168.1.1/0xffffff00" ""
}
log "Activating firewall script generated Wed Feb 16 13:24:44 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:15 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall11.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:46 2011 PST by vadim
# Generated Wed Feb 16 14:33:18 2011 PST by vadim
#
# files: * firewall11.fw /etc/firewall11.fw
# files: firewall11.conf /etc/firewall11.conf
@ -77,7 +77,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Wed Feb 16 13:24:46 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:18 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall110.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:47 2011 PST by vadim
# Generated Wed Feb 16 14:33:18 2011 PST by vadim
#
# files: * firewall110.fw /etc/fw/firewall110.fw
# files: firewall110.conf /etc/fw/firewall110.conf
@ -76,7 +76,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Wed Feb 16 13:24:47 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:18 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall12.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:47 2011 PST by vadim
# Generated Wed Feb 16 14:33:19 2011 PST by vadim
#
# files: * firewall12.fw /etc/fw/firewall12.fw
# files: firewall12.conf /etc/fw/firewall12.conf
@ -159,7 +159,7 @@ configure_interfaces() {
update_addresses_of_interface "lo0 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Wed Feb 16 13:24:47 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:19 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall13.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:48 2011 PST by vadim
# Generated Wed Feb 16 14:33:19 2011 PST by vadim
#
# files: * firewall13.fw /etc/fw/firewall13.fw
# files: firewall13.conf /etc/fw/firewall13.conf
@ -88,7 +88,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Wed Feb 16 13:24:48 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:19 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall14-1.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:49 2011 PST by vadim
# Generated Wed Feb 16 14:33:20 2011 PST by vadim
#
# files: * firewall14-1.fw /etc/firewall14-1.fw
# files: firewall14-1.conf /etc/firewall14-1.conf
@ -241,7 +241,7 @@ configure_interfaces() {
update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" ""
}
log "Activating firewall script generated Wed Feb 16 13:24:49 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:20 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall14.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:49 2011 PST by vadim
# Generated Wed Feb 16 14:33:20 2011 PST by vadim
#
# files: * firewall14.fw /etc/firewall14.fw
# files: firewall14.conf /etc/firewall14.conf
@ -241,7 +241,7 @@ configure_interfaces() {
update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" ""
}
log "Activating firewall script generated Wed Feb 16 13:24:49 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:20 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall2-1.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:51 2011 PST by vadim
# Generated Wed Feb 16 14:33:23 2011 PST by vadim
#
# files: * firewall2-1.fw /etc/fw/firewall2-1.fw
# files: firewall2-1.conf /etc/fw/firewall2-1.conf
@ -88,7 +88,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Wed Feb 16 13:24:51 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:23 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall2.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:50 2011 PST by vadim
# Generated Wed Feb 16 14:33:21 2011 PST by vadim
#
# files: * firewall2.fw /etc/fw/firewall2.fw
# files: firewall2.conf /etc/fw/firewall2.conf
@ -73,7 +73,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Wed Feb 16 13:24:50 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:21 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall20.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:50 2011 PST by vadim
# Generated Wed Feb 16 14:33:22 2011 PST by vadim
#
# files: * firewall20.fw /etc/fw/firewall20.fw
# files: firewall20.conf /etc/fw/firewall20.conf
@ -73,7 +73,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Wed Feb 16 13:24:50 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:22 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall21.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:51 2011 PST by vadim
# Generated Wed Feb 16 14:33:22 2011 PST by vadim
#
# files: * firewall21.fw /etc/fw/firewall21.fw
# files: firewall21.conf /etc/fw/firewall21.conf
@ -81,7 +81,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Wed Feb 16 13:24:51 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:22 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall22.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:52 2011 PST by vadim
# Generated Wed Feb 16 14:33:23 2011 PST by vadim
#
# files: * firewall22.fw /etc/fw/firewall22.fw
# files: firewall22.conf /etc/fw/firewall22.conf
@ -80,7 +80,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Wed Feb 16 13:24:52 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:23 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall3.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:53 2011 PST by vadim
# Generated Wed Feb 16 14:33:24 2011 PST by vadim
#
# files: * firewall3.fw /etc/firewall3.fw
# files: firewall3.conf /etc/firewall3.conf
@ -159,7 +159,7 @@ configure_interfaces() {
update_addresses_of_interface "lo 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Wed Feb 16 13:24:53 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:24 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall33.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:55 2011 PST by vadim
# Generated Wed Feb 16 14:33:25 2011 PST by vadim
#
# files: * firewall33.fw /etc/fw/firewall33.fw
# files: firewall33.conf /etc/fw/firewall33.conf
@ -162,7 +162,7 @@ configure_interfaces() {
update_addresses_of_interface "lo 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Wed Feb 16 13:24:55 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:25 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall34.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:54 2011 PST by vadim
# Generated Wed Feb 16 14:33:25 2011 PST by vadim
#
# files: * firewall34.fw /etc/fw/firewall34.fw
# files: firewall34.conf /etc/fw/firewall34.conf
@ -158,7 +158,7 @@ configure_interfaces() {
update_addresses_of_interface "lo 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Wed Feb 16 13:24:54 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:25 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall38.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:55 2011 PST by vadim
# Generated Wed Feb 16 14:33:26 2011 PST by vadim
#
# files: * firewall38.fw /etc/fw/firewall38.fw
# files: firewall38.conf /etc/fw/firewall38.conf
@ -76,7 +76,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Wed Feb 16 13:24:55 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:26 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall39.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:56 2011 PST by vadim
# Generated Wed Feb 16 14:33:26 2011 PST by vadim
#
# files: * firewall39.fw pf.fw
# files: firewall39.conf pf.conf
@ -79,7 +79,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Wed Feb 16 13:24:56 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:26 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall4.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:56 2011 PST by vadim
# Generated Wed Feb 16 14:33:27 2011 PST by vadim
#
# files: * firewall4.fw pf.fw
# files: firewall4.conf /etc/fw/pf.conf
@ -77,7 +77,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Wed Feb 16 13:24:56 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:27 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall40-1.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:58 2011 PST by vadim
# Generated Wed Feb 16 14:33:28 2011 PST by vadim
#
# files: * firewall40-1.fw /etc/firewall40-1.fw
# files: firewall40-1.conf /etc/firewall40-1.conf
@ -176,7 +176,7 @@ configure_interfaces() {
update_addresses_of_interface "lo0 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Wed Feb 16 13:24:58 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:28 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall40.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:57 2011 PST by vadim
# Generated Wed Feb 16 14:33:28 2011 PST by vadim
#
# files: * firewall40.fw /etc/firewall40.fw
# files: firewall40.conf /etc/firewall40.conf
@ -160,7 +160,7 @@ configure_interfaces() {
update_addresses_of_interface "lo0 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Wed Feb 16 13:24:57 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:28 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall41.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:58 2011 PST by vadim
# Generated Wed Feb 16 14:33:29 2011 PST by vadim
#
# files: * firewall41.fw /etc/firewall41.fw
# files: firewall41.conf /etc/firewall41.conf
@ -163,7 +163,7 @@ configure_interfaces() {
update_addresses_of_interface "eth1 2.2.2.2/0xffffff00" ""
}
log "Activating firewall script generated Wed Feb 16 13:24:58 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:29 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall5.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:24:59 2011 PST by vadim
# Generated Wed Feb 16 14:33:30 2011 PST by vadim
#
# files: * firewall5.fw /etc/fw/firewall5.fw
# files: firewall5.conf /etc/fw/firewall5.conf
@ -77,7 +77,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Wed Feb 16 13:24:59 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:30 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall51.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:25:00 2011 PST by vadim
# Generated Wed Feb 16 14:33:30 2011 PST by vadim
#
# files: * firewall51.fw /etc/fw/firewall51.fw
# files: firewall51.conf /etc/fw/firewall51.conf
@ -80,7 +80,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Wed Feb 16 13:25:00 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:30 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall6.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:25:00 2011 PST by vadim
# Generated Wed Feb 16 14:33:31 2011 PST by vadim
#
# files: * firewall6.fw /etc/fw/firewall6.fw
# files: firewall6.conf /etc/fw/firewall6.conf
@ -73,7 +73,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Wed Feb 16 13:25:00 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:31 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall62.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:25:01 2011 PST by vadim
# Generated Wed Feb 16 14:33:31 2011 PST by vadim
#
# files: * firewall62.fw /etc/firewall62.fw
# files: firewall62.conf /etc/firewall62.conf
@ -185,7 +185,7 @@ configure_interfaces() {
update_addresses_of_interface "en1 222.222.222.222/0xffffff00" ""
}
log "Activating firewall script generated Wed Feb 16 13:25:01 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:31 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall63.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:25:01 2011 PST by vadim
# Generated Wed Feb 16 14:33:32 2011 PST by vadim
#
# files: * firewall63.fw /etc/fw/firewall63.fw
# files: firewall63.conf /etc/fw/firewall63.conf
@ -77,7 +77,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Wed Feb 16 13:25:01 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:32 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall7.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:25:02 2011 PST by vadim
# Generated Wed Feb 16 14:33:33 2011 PST by vadim
#
# files: * firewall7.fw /etc/fw/firewall7.fw
# files: firewall7.conf /etc/fw/firewall7.conf
@ -73,7 +73,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Wed Feb 16 13:25:02 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:33 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall70.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:25:02 2011 PST by vadim
# Generated Wed Feb 16 14:33:33 2011 PST by vadim
#
# files: * firewall70.fw /etc/fw/firewall70.fw
# files: firewall70.conf /etc/fw/firewall70.conf
@ -82,7 +82,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Wed Feb 16 13:25:02 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:33 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall8.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:25:03 2011 PST by vadim
# Generated Wed Feb 16 14:33:34 2011 PST by vadim
#
# files: * firewall8.fw /etc/firewall8.fw
# files: firewall8.conf /etc/firewall8.conf
@ -72,7 +72,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Wed Feb 16 13:25:03 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:34 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall80-4.5.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:25:05 2011 PST by vadim
# Generated Wed Feb 16 14:33:35 2011 PST by vadim
#
# files: * firewall80-4.5.fw /etc/firewall80-4.5.fw
# files: firewall80-4.5.conf /etc/firewall80-4.5.conf
@ -73,7 +73,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Wed Feb 16 13:25:05 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:35 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall80.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:25:03 2011 PST by vadim
# Generated Wed Feb 16 14:33:34 2011 PST by vadim
#
# files: * firewall80.fw /etc/firewall80.fw
# files: firewall80.conf /etc/firewall80.conf
@ -73,7 +73,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Wed Feb 16 13:25:03 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:34 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall9.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:25:05 2011 PST by vadim
# Generated Wed Feb 16 14:33:35 2011 PST by vadim
#
# files: * firewall9.fw /etc/fw/firewall9.fw
# files: firewall9.conf /etc/fw/firewall9.conf
@ -76,7 +76,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Wed Feb 16 13:25:05 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:35 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall91.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:25:06 2011 PST by vadim
# Generated Wed Feb 16 14:33:36 2011 PST by vadim
#
# files: * firewall91.fw /etc/fw/pf.fw
# files: firewall91.conf /etc/fw/pf.conf
@ -240,7 +240,7 @@ configure_interfaces() {
update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" ""
}
log "Activating firewall script generated Wed Feb 16 13:25:06 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:36 2011 by vadim"
set_kernel_vars
configure_interfaces

6
test/pf/firewall92.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:25:06 2011 PST by vadim
# Generated Wed Feb 16 14:33:36 2011 PST by vadim
#
# files: * firewall92.fw /etc/fw/pf.fw
# files: firewall92.conf /etc/fw/path\ with\ space/pf.conf
@ -160,7 +160,7 @@ configure_interfaces() {
update_addresses_of_interface "em1 10.1.1.81/0xffffff00" ""
}
log "Activating firewall script generated Wed Feb 16 13:25:06 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:36 2011 by vadim"
set_kernel_vars
configure_interfaces

31
test/pf/objects-for-regression-tests.fwb
View File

@ -22621,13 +22621,18 @@
</Routing>
<Interface id="id35212X5121" dedicated_failover="False" dyn="False" label="" mgmt="True" security_level="100" unnum="False" unprotected="False" name="em0" comment="" ro="False">
<IPv4 id="id35215X5121" name="firewall109:em0:ip" comment="" ro="False" address="10.3.14.81" netmask="255.255.255.0"/>
<InterfaceOptions/>
<InterfaceOptions>
<Option name="iface_mtu">1500</Option>
</InterfaceOptions>
</Interface>
<Interface id="id35217X5121" dedicated_failover="False" dyn="False" label="" mgmt="False" security_level="100" unnum="True" unprotected="False" name="em1" comment="" ro="False">
<InterfaceOptions/>
<InterfaceOptions>
<Option name="iface_mtu">1500</Option>
</InterfaceOptions>
</Interface>
<Interface id="id35222X5121" dedicated_failover="False" dyn="False" label="" mgmt="False" security_level="0" unnum="True" unprotected="False" name="em2" comment="" ro="False">
<InterfaceOptions>
<Option name="iface_mtu">1500</Option>
<Option name="type">ethernet</Option>
</InterfaceOptions>
<Interface id="id35231X5121" dedicated_failover="False" dyn="False" label="" mgmt="False" security_level="0" unnum="False" unprotected="False" name="vlan101" comment="" ro="False">
@ -22791,7 +22796,7 @@
<Option name="sshArgs"></Option>
</FirewallOptions>
</Firewall>
<Firewall id="id35385X5600" host_OS="freebsd" inactive="False" lastCompiled="1297728261" lastInstalled="1271995582" lastModified="1297727987" platform="pf" version="4.7" name="firewall109-1" comment="complex configuration with bridge and vlan, rc.conf format" ro="False">
<Firewall id="id35385X5600" host_OS="freebsd" inactive="False" lastCompiled="1297728261" lastInstalled="1271995582" lastModified="1297896045" platform="pf" version="4.7" name="firewall109-1" comment="complex configuration with bridge and vlan, rc.conf format" ro="False">
<NAT id="id35466X5600" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
<RuleSetOptions/>
</NAT>
@ -22823,14 +22828,28 @@
</Routing>
<Interface id="id35393X5600" dedicated_failover="False" dyn="False" label="" mgmt="True" security_level="100" unnum="False" unprotected="False" name="em0" comment="" ro="False">
<IPv4 id="id35396X5600" name="firewall109:em0:ip" comment="" ro="False" address="10.3.14.81" netmask="255.255.255.0"/>
<InterfaceOptions/>
<InterfaceOptions>
<Option name="iface_mtu">1500</Option>
</InterfaceOptions>
</Interface>
<Interface id="id35398X5600" dedicated_failover="False" dyn="False" label="" mgmt="False" security_level="100" unnum="True" unprotected="False" name="em1" comment="" ro="False">
<InterfaceOptions/>
<InterfaceOptions>
<Option name="enable_stp">False</Option>
<Option name="iface_configure_mtu">False</Option>
<Option name="iface_mtu">1500</Option>
<Option name="iface_options">media 100baseTX mediaopt full-duplex</Option>
<Option name="type">ethernet</Option>
<Option name="vlan_id">0</Option>
</InterfaceOptions>
</Interface>
<Interface id="id35401X5600" dedicated_failover="False" dyn="False" label="" mgmt="False" security_level="0" unnum="True" unprotected="False" name="em2" comment="" ro="False">
<InterfaceOptions>
<Option name="enable_stp">False</Option>
<Option name="iface_configure_mtu">False</Option>
<Option name="iface_mtu">1500</Option>
<Option name="iface_options">media 100baseTX mediaopt full-duplex</Option>
<Option name="type">ethernet</Option>
<Option name="vlan_id">0</Option>
</InterfaceOptions>
<Interface id="id35410X5600" dedicated_failover="False" dyn="False" label="" mgmt="False" security_level="0" unnum="False" unprotected="False" name="vlan101" comment="" ro="False">
<IPv4 id="id35413X5600" name="firewall109:em2:vlan101:ip" comment="" ro="False" address="192.168.101.1" netmask="255.255.255.0"/>
@ -22991,7 +23010,7 @@
<Option name="sshArgs"></Option>
</FirewallOptions>
</Firewall>
<Firewall id="id35513X5911" host_OS="freebsd" inactive="False" lastCompiled="1297728239" lastInstalled="1271995582" lastModified="1297891411" platform="pf" version="4.7" name="firewall109-2" comment="complex configuration with bridge and vlan, uses vlan interfaces with names not matching vlan IDs&#10;" ro="False">
<Firewall id="id35513X5911" host_OS="freebsd" inactive="False" lastCompiled="1297894219" lastInstalled="1271995582" lastModified="1297891411" platform="pf" version="4.7" name="firewall109-2" comment="complex configuration with bridge and vlan, uses vlan interfaces with names not matching vlan IDs&#10;" ro="False">
<NAT id="id35594X5911" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
<RuleSetOptions/>
</NAT>

14
test/pf/pf_cluster_1_openbsd-1.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:25:09 2011 PST by vadim
# Generated Wed Feb 16 14:33:39 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
@ -281,18 +281,18 @@ configure_interfaces() {
sync_vlan_interfaces
sync_carp_interfaces carp0 carp1
sync_pfsync_interfaces pfsync0
$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" ""
$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" ""
}
log "Activating firewall script generated Wed Feb 16 13:25:09 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:39 2011 by vadim"
set_kernel_vars
configure_interfaces

12
test/pf/pf_cluster_1_openbsd-2.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:25:09 2011 PST by vadim
# Generated Wed Feb 16 14:33:39 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
@ -180,16 +180,16 @@ run_epilog_and_exit() {
configure_interfaces() {
:
sync_carp_interfaces carp0 carp1
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" ""
$IFCONFIG carp0 vhid 101 pass secret advskew 1 carpdev en0
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" ""
}
log "Activating firewall script generated Wed Feb 16 13:25:09 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:39 2011 by vadim"
set_kernel_vars
configure_interfaces

14
test/pf/pf_cluster_2_freebsd-1.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:25:09 2011 PST by vadim
# Generated Wed Feb 16 14:33:39 2011 PST by vadim
#
# files: * pf_cluster_2_freebsd-1.fw /etc/pf_cluster_2_freebsd-1.fw
# files: pf_cluster_2_freebsd-1.conf /etc/pf_cluster_2_freebsd-1.conf
@ -284,17 +284,17 @@ configure_interfaces() {
sync_vlan_interfaces
sync_carp_interfaces carp0 carp1
sync_pfsync_interfaces pfsync0
$IFCONFIG carp0 vhid 101 pass secret advskew 5
update_addresses_of_interface "carp0 172.24.0.1/0xffffff00 172.24.0.1/0xffffff00" ""
$IFCONFIG carp1 vhid 100 pass secret advskew 5
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" ""
$IFCONFIG carp0 vhid 101 pass secret advskew 5
update_addresses_of_interface "carp0 172.24.0.1/0xffffff00 172.24.0.1/0xffffff00" ""
$IFCONFIG carp1 vhid 100 pass secret advskew 5
update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" ""
}
log "Activating firewall script generated Wed Feb 16 13:25:09 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:39 2011 by vadim"
set_kernel_vars
configure_interfaces

10
test/pf/pf_cluster_2_freebsd-2.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:25:09 2011 PST by vadim
# Generated Wed Feb 16 14:33:39 2011 PST by vadim
#
# files: * pf_cluster_2_freebsd-2.fw /etc/pf_cluster_2_freebsd-2.fw
# files: pf_cluster_2_freebsd-2.conf /etc/pf_cluster_2_freebsd-2.conf
@ -183,15 +183,15 @@ run_epilog_and_exit() {
configure_interfaces() {
:
sync_carp_interfaces carp0 carp1
update_addresses_of_interface "en0 172.24.0.3/0xffffff00" ""
update_addresses_of_interface "en1 192.168.1.3/0xffffff00" ""
$IFCONFIG carp0 vhid 101 pass secret advskew 10
update_addresses_of_interface "carp0 172.24.0.1/0xffffff00 172.24.0.1/0xffffff00" ""
$IFCONFIG carp1 vhid 100 pass secret advskew 10
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 Wed Feb 16 13:25:09 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:39 2011 by vadim"
set_kernel_vars
configure_interfaces

18
test/pf/pf_cluster_3_openbsd-3.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:25:10 2011 PST by vadim
# Generated Wed Feb 16 14:33:39 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
@ -281,21 +281,21 @@ configure_interfaces() {
sync_vlan_interfaces vlan100
sync_carp_interfaces carp0 carp1 carp2
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 "vlan100 172.20.0.2/0xffffff00" ""
$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" ""
}
log "Activating firewall script generated Wed Feb 16 13:25:10 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:39 2011 by vadim"
set_kernel_vars
configure_interfaces

16
test/pf/pf_cluster_3_openbsd-4.fw.orig
View File

@ -2,9 +2,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:25:10 2011 PST by vadim
# Generated Wed Feb 16 14:33:40 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
@ -180,20 +180,20 @@ run_epilog_and_exit() {
configure_interfaces() {
:
sync_carp_interfaces carp0 carp1 carp2
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 "vlan100 172.20.0.3/0xffffff00" ""
$IFCONFIG carp0 vhid 1 pass "" advskew 1 carpdev en0
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 "vlan100 172.20.0.3/0xffffff00" ""
}
log "Activating firewall script generated Wed Feb 16 13:25:10 2011 by vadim"
log "Activating firewall script generated Wed Feb 16 14:33:40 2011 by vadim"
set_kernel_vars
configure_interfaces

12
test/pf/pf_cluster_4_rc.conf.local
View File

@ -1,9 +1,9 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3477
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 13:25:10 2011 PST by vadim
# Generated Wed Feb 16 14:33:40 2011 PST by vadim
#
# files: * pf_cluster_4_rc.conf.local /etc/pf_cluster_4_rc.conf.local
# files: pf_cluster_4_pf.conf /etc/pf_cluster_4_pf.conf
@ -19,14 +19,14 @@ gateway_enable="YES"
cloned_interfaces="carp0 carp1"
network_interfaces="carp0 carp1 en0 en1"
ifconfig_carp0="vhid 101 pass secret advskew 10"
ifconfig_carp0="172.24.0.1 netmask 0xffffff00"
ifconfig_carp1="vhid 100 pass secret advskew 10"
ifconfig_carp1="192.168.1.1 netmask 0xffffff00"
pfsync_syncdev="en0"
pfsync_syncpeer="172.24.0.2"
ifconfig_en0="172.24.0.3 netmask 0xffffff00"
ifconfig_en1="192.168.1.3 netmask 0xffffff00"
ifconfig_carp0="vhid 101 pass secret advskew 10"
ifconfig_carp0="172.24.0.1 netmask 0xffffff00"
ifconfig_carp1="vhid 100 pass secret advskew 10"
ifconfig_carp1="192.168.1.1 netmask 0xffffff00"
pfsync_enable="YES"
pf_enable="YES"