onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-20 10:17:16 +01:00
Code Issues Releases Wiki Activity

fixes #2092 parameter "stp" is now optional and is controlled by a checkbox in the interface settings dialog

Browse Source
This commit is contained in:
Vadim Kurland 2011-02-14 15:53:55 -08:00
parent b5d57a740b
commit ec5bb2290d
72 changed files with 273 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libgui/bsdifaceoptsdialog_q.ui
View File

@ -201,7 +201,7 @@
</sizepolicy>
</property>
<property name="currentIndex">
<number>1</number>
<number>3</number>
</property>
<widget class="QWidget" name="page"/>
<widget class="QWidget" name="page_ethernet"/>

2
src/libgui/linux24ifaceoptsdialog_q.ui
View File

@ -138,7 +138,7 @@
</sizepolicy>
</property>
<property name="currentIndex">
<number>0</number>
<number>2</number>
</property>
<widget class="QWidget" name="page_ethernet"/>
<widget class="QWidget" name="page_lan">

29
src/pflib/OSConfigurator_bsd_interfaces.cpp
View File

@ -484,12 +484,31 @@ void OSConfigurator_bsd::summaryConfigLineBridge(QStringList bridge_names)
void OSConfigurator_bsd::interfaceConfigLineBridge(Interface *iface,
QStringList bridge_port_names)
QStringList bridge_port_names)
{
interface_configuration_lines[iface->getName().c_str()] <<
QString("update_bridge_interface %1 \"%2\"")
.arg(iface->getName().c_str())
.arg(bridge_port_names.join(" "));
QString iface_name = iface->getName().c_str();
FWOptions *ifopt = iface->getOptionsObject();
assert(ifopt != NULL);
bool enable_stp = ifopt->getBool("enable_stp");
Configlet bridge_configlet(fw, "bsd", "bridge_interface");
bridge_configlet.removeComments();
bridge_configlet.collapseEmptyStrings(true);
bridge_configlet.setVariable("bridge_interface", iface_name);
bridge_configlet.setVariable("bridge_ports", bridge_port_names.join(" "));
interface_configuration_lines[iface_name] << bridge_configlet.expand();
foreach (QString bridge_port, bridge_port_names)
{
Configlet port_configlet(fw, "bsd", "bridge_port");
port_configlet.removeComments();
port_configlet.collapseEmptyStrings(true);
port_configlet.setVariable("bridge_interface", iface_name);
port_configlet.setVariable("bridge_port", bridge_port);
port_configlet.setVariable("stp_off", !enable_stp);
interface_configuration_lines[iface_name] << port_configlet.expand();
}
}
void OSConfigurator_bsd::summaryConfigLineCARP(QStringList carp_names)

16
src/pflib/OSConfigurator_freebsd.cpp
View File

@ -327,12 +327,11 @@ void OSConfigurator_freebsd::summaryConfigLineBridge(QStringList bridge_names)
Refernce:
http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/network-bridging.html
TODO: STP support should be optional
*/
void OSConfigurator_freebsd::interfaceConfigLineBridge(Interface *iface,
QStringList bridge_port_names)
{
QString iface_name = iface->getName().c_str();
FWOptions* options = fw->getOptionsObject();
if (options->getBool("generate_rc_conf_file"))
{
@ -345,20 +344,25 @@ void OSConfigurator_freebsd::interfaceConfigLineBridge(Interface *iface,
QStringList bp;
foreach(QString bridge_port, bridge_port_names)
{
bp << QString("addm %1 %2 %3")
.arg(bridge_port).arg((enable_stp)?"stp":"").arg(bridge_port);
Configlet port_configlet(fw, "freebsd", "rc_conf_bridge_port");
port_configlet.removeComments();
port_configlet.collapseEmptyStrings(true);
port_configlet.setVariable("bridge_interface", iface_name);
port_configlet.setVariable("bridge_port", bridge_port);
port_configlet.setVariable("stp_off", !enable_stp);
bp << port_configlet.expand();
}
bp << "up";
ifconfig_lines[iface->getName().c_str()] << bp.join(" ");
ifconfig_lines[iface_name] << bp.join(" ");
foreach(QString bridge_port, bridge_port_names)
{
ifconfig_lines[bridge_port] << "up";
}
interface_configuration_lines[iface->getName().c_str()] << outp.join("\n");
interface_configuration_lines[iface_name] << outp.join("\n");
} else
OSConfigurator_bsd::interfaceConfigLineBridge(iface, bridge_port_names);
}

9
src/res/configlets/bsd/bridge_interface Normal file
View File

@ -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.
##
update_bridge_interface {{$bridge_interface}} "{{$bridge_ports}}"

9
src/res/configlets/bsd/bridge_port Normal file
View File

@ -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 {{$bridge_interface}} {{if stp_off}}-{{endif}}stp {{$bridge_port}}

9
src/res/configlets/freebsd/rc_conf_bridge_port Normal file
View File

@ -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.
##
addm {{$bridge_port}} {{if stp_off}}-{{endif}}stp {{$bridge_port}}

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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:14 2011 PST by vadim
# Generated Mon Feb 14 15:52:49 2011 PST by vadim
#
# files: * firewall-base-rulesets.fw /etc/fw/firewall-base-rulesets.fw
# files: firewall-base-rulesets.conf /etc/fw/firewall-base-rulesets.conf
@ -163,7 +163,7 @@ configure_interfaces() {
update_addresses_of_interface "en2 192.168.100.1/0xffffff00" ""
}
log "Activating firewall script generated Sun Feb 13 22:28:14 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:49 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:14 2011 PST by vadim
# Generated Mon Feb 14 15:52:49 2011 PST by vadim
#
# files: * firewall-ipv6-1.fw pf-ipv6.fw
# files: firewall-ipv6-1.conf /etc/fw/pf-ipv6.conf
@ -175,7 +175,7 @@ configure_interfaces() {
update_addresses_of_interface "lo ::1/128 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Sun Feb 13 22:28:14 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:49 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:16 2011 PST by vadim
# Generated Mon Feb 14 15:52:50 2011 PST by vadim
#
# files: * firewall-ipv6-2.fw pf.fw
# files: firewall-ipv6-2.conf pf.conf
@ -179,7 +179,7 @@ configure_interfaces() {
update_addresses_of_interface "lo ::1/128 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Sun Feb 13 22:28:16 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:50 2011 by vadim"
set_kernel_vars
configure_interfaces

4
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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:16 2011 PST by vadim
# Generated Mon Feb 14 15:52:50 2011 PST by vadim
#
# files: * firewall-ipv6-3.fw /etc/firewall-ipv6-3.fw
# files: firewall-ipv6-3.conf /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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:27:44 2011 PST by vadim
# Generated Mon Feb 14 15:52:17 2011 PST by vadim
#
# files: * firewall.fw /etc/pf.fw
# files: firewall.conf /etc/pf.conf
@ -167,7 +167,7 @@ configure_interfaces() {
update_addresses_of_interface "lo 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Sun Feb 13 22:27:44 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:17 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:27:45 2011 PST by vadim
# Generated Mon Feb 14 15:52:17 2011 PST by vadim
#
# files: * firewall1.fw /etc/fw/firewall1.fw
# files: firewall1.conf /etc/fw/firewall1.conf
@ -76,7 +76,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 22:27:45 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:17 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:27:46 2011 PST by vadim
# Generated Mon Feb 14 15:52:20 2011 PST by vadim
#
# files: * firewall10-1.fw /etc/fw/firewall10-1.fw
# files: firewall10-1.conf /etc/fw/firewall10-1.conf
@ -74,7 +74,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 22:27:46 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:20 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:27:47 2011 PST by vadim
# Generated Mon Feb 14 15:52:21 2011 PST by vadim
#
# files: * firewall10-2.fw /etc/fw/firewall10-2.fw
# files: firewall10-2.conf /etc/fw/firewall10-2.conf
@ -74,7 +74,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 22:27:47 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:21 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:27:48 2011 PST by vadim
# Generated Mon Feb 14 15:52:22 2011 PST by vadim
#
# files: * firewall10-3.fw /etc/fw/firewall10-3.fw
# files: firewall10-3.conf /etc/fw/firewall10-3.conf
@ -76,7 +76,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 22:27:48 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:22 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:27:51 2011 PST by vadim
# Generated Mon Feb 14 15:52:24 2011 PST by vadim
#
# files: * firewall10-4.fw /etc/fw/firewall10-4.fw
# files: firewall10-4.conf /etc/fw/firewall10-4.conf
@ -76,7 +76,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 22:27:51 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:24 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:27:52 2011 PST by vadim
# Generated Mon Feb 14 15:52:26 2011 PST by vadim
#
# files: * firewall10-5.fw /etc/fw/firewall10-5.fw
# files: firewall10-5.conf /etc/fw/firewall10-5.conf
@ -77,7 +77,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 22:27:52 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:26 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:27:53 2011 PST by vadim
# Generated Mon Feb 14 15:52:27 2011 PST by vadim
#
# files: * firewall10-6.fw /etc/fw/firewall10-6.fw
# files: firewall10-6.conf /etc/fw/firewall10-6.conf
@ -77,7 +77,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 22:27:53 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:27 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:27:45 2011 PST by vadim
# Generated Mon Feb 14 15:52:18 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 Sun Feb 13 22:27:45 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:18 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:27:46 2011 PST by vadim
# Generated Mon Feb 14 15:52:19 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 Sun Feb 13 22:27:46 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:19 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:27:47 2011 PST by vadim
# Generated Mon Feb 14 15:52:20 2011 PST by vadim
#
# files: * firewall102.fw /etc/fw/pf.fw
# files: firewall102.conf /etc/fw/path\ with\ space/pf.conf

8
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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:27:49 2011 PST by vadim
# Generated Mon Feb 14 15:52:23 2011 PST by vadim
#
# files: * firewall103-1.fw /etc/fw/pf.fw
# files: firewall103-1.conf /etc/fw/path\ with\ space/pf.conf
@ -378,6 +378,8 @@ configure_interfaces() {
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" ""
@ -385,7 +387,7 @@ configure_interfaces() {
update_addresses_of_interface "em3" ""
}
log "Activating firewall script generated Sun Feb 13 22:27:49 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:23 2011 by vadim"
set_kernel_vars
configure_interfaces

8
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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:27:49 2011 PST by vadim
# Generated Mon Feb 14 15:52:23 2011 PST by vadim
#
# files: * firewall103-2.fw /etc/fw/pf.fw
# files: firewall103-2.conf /etc/fw/path\ with\ space/pf.conf
@ -378,6 +378,8 @@ configure_interfaces() {
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" ""
@ -385,7 +387,7 @@ configure_interfaces() {
update_addresses_of_interface "em3" ""
}
log "Activating firewall script generated Sun Feb 13 22:27:49 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:23 2011 by vadim"
set_kernel_vars
configure_interfaces

8
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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:27:48 2011 PST by vadim
# Generated Mon Feb 14 15:52:21 2011 PST by vadim
#
# files: * firewall103.fw /etc/fw/pf.fw
# files: firewall103.conf /etc/fw/path\ with\ space/pf.conf
@ -381,6 +381,8 @@ configure_interfaces() {
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" ""
@ -388,7 +390,7 @@ configure_interfaces() {
update_addresses_of_interface "em3" ""
}
log "Activating firewall script generated Sun Feb 13 22:27:48 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:21 2011 by vadim"
set_kernel_vars
configure_interfaces

8
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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:27:51 2011 PST by vadim
# Generated Mon Feb 14 15:52:25 2011 PST by vadim
#
# files: * firewall104-1.fw /etc/fw/pf.fw
# files: firewall104-1.conf /etc/fw/path\ with\ space/pf.conf
@ -378,13 +378,15 @@ configure_interfaces() {
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" ""
}
log "Activating firewall script generated Sun Feb 13 22:27:51 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:25 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -2,16 +2,16 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:27:50 2011 PST by vadim
# Generated Mon Feb 14 15:52:24 2011 PST by vadim
#
# files: * firewall104.fw /etc/fw/pf.fw
# files: firewall104.conf /etc/fw/path\ with\ space/pf.conf
#
# Compiled for pf 4.7
#
# bridge interface, dynamic address, shell script format
# bridge interface, dynamic address, shell script format, with STP
@ -381,13 +381,15 @@ configure_interfaces() {
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" ""
}
log "Activating firewall script generated Sun Feb 13 22:27:50 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:24 2011 by vadim"
set_kernel_vars
configure_interfaces

6
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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:27:52 2011 PST by vadim
# Generated Mon Feb 14 15:52:25 2011 PST by vadim
#
# files: * firewall105.fw /etc/fw/pf.fw
# files: firewall105.conf /etc/fw/path\ with\ space/pf.conf
@ -21,7 +21,7 @@ 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_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"

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

@ -1,16 +1,16 @@
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v4.2.0.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:27:53 2011 PST by vadim
# Generated Mon Feb 14 15:52:27 2011 PST by vadim
#
# files: * firewall106.fw /etc/fw/pf.fw
# files: firewall106.conf /etc/fw/path\ with\ space/pf.conf
#
# Compiled for pf 4.7
#
# bridge interface, dynamic address, rc.conf format
# bridge interface, dynamic address, rc.conf format, with STP
# firewall106:Routing:1: error: Gateway and interface are both empty in the rule
# firewall106:Routing:1: error: Rules 0 (main) and 1 (main) define routes to the same destination 0.0.0.0/0.0.0.0 via different gateways. This configuration is not supported for freebsd

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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:27:54 2011 PST by vadim
# Generated Mon Feb 14 15:52:28 2011 PST by vadim
#
# files: * firewall107.fw /etc/fw/pf.fw
# files: firewall107.conf /etc/fw/path\ with\ space/pf.conf
@ -388,7 +388,7 @@ configure_interfaces() {
update_addresses_of_interface "vlan102 192.168.102.1/0xffffff00" ""
}
log "Activating firewall script generated Sun Feb 13 22:27:54 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:28 2011 by vadim"
set_kernel_vars
configure_interfaces

4
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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:27:54 2011 PST by vadim
# Generated Mon Feb 14 15:52:29 2011 PST by vadim
#
# files: * firewall108.fw /etc/fw/pf.fw
# files: firewall108.conf /etc/fw/path\ with\ space/pf.conf

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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:27:55 2011 PST by vadim
# Generated Mon Feb 14 15:52:29 2011 PST by vadim
#
# files: * firewall11.fw /etc/firewall11.fw
# files: firewall11.conf /etc/firewall11.conf
@ -77,7 +77,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 22:27:55 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:29 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:27:55 2011 PST by vadim
# Generated Mon Feb 14 15:52:30 2011 PST by vadim
#
# files: * firewall110.fw /etc/fw/firewall110.fw
# files: firewall110.conf /etc/fw/firewall110.conf
@ -76,7 +76,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 22:27:55 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:30 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:27:56 2011 PST by vadim
# Generated Mon Feb 14 15:52:30 2011 PST by vadim
#
# files: * firewall12.fw /etc/fw/firewall12.fw
# files: firewall12.conf /etc/fw/firewall12.conf
@ -159,7 +159,7 @@ configure_interfaces() {
update_addresses_of_interface "lo0 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Sun Feb 13 22:27:56 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:30 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:27:56 2011 PST by vadim
# Generated Mon Feb 14 15:52:31 2011 PST by vadim
#
# files: * firewall13.fw /etc/fw/firewall13.fw
# files: firewall13.conf /etc/fw/firewall13.conf
@ -88,7 +88,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 22:27:56 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:31 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:27:58 2011 PST by vadim
# Generated Mon Feb 14 15:52:32 2011 PST by vadim
#
# files: * firewall14-1.fw /etc/firewall14-1.fw
# files: firewall14-1.conf /etc/firewall14-1.conf
@ -241,7 +241,7 @@ configure_interfaces() {
update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" ""
}
log "Activating firewall script generated Sun Feb 13 22:27:58 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:32 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:27:57 2011 PST by vadim
# Generated Mon Feb 14 15:52:31 2011 PST by vadim
#
# files: * firewall14.fw /etc/firewall14.fw
# files: firewall14.conf /etc/firewall14.conf
@ -241,7 +241,7 @@ configure_interfaces() {
update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" ""
}
log "Activating firewall script generated Sun Feb 13 22:27:57 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:31 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:00 2011 PST by vadim
# Generated Mon Feb 14 15:52:34 2011 PST by vadim
#
# files: * firewall2-1.fw /etc/fw/firewall2-1.fw
# files: firewall2-1.conf /etc/fw/firewall2-1.conf
@ -88,7 +88,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 22:28:00 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:34 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:27:58 2011 PST by vadim
# Generated Mon Feb 14 15:52:32 2011 PST by vadim
#
# files: * firewall2.fw /etc/fw/firewall2.fw
# files: firewall2.conf /etc/fw/firewall2.conf
@ -73,7 +73,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 22:27:58 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:32 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:27:59 2011 PST by vadim
# Generated Mon Feb 14 15:52:33 2011 PST by vadim
#
# files: * firewall20.fw /etc/fw/firewall20.fw
# files: firewall20.conf /etc/fw/firewall20.conf
@ -73,7 +73,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 22:27:59 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:33 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:27:59 2011 PST by vadim
# Generated Mon Feb 14 15:52:33 2011 PST by vadim
#
# files: * firewall21.fw /etc/fw/firewall21.fw
# files: firewall21.conf /etc/fw/firewall21.conf
@ -81,7 +81,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 22:27:59 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:33 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:01 2011 PST by vadim
# Generated Mon Feb 14 15:52:35 2011 PST by vadim
#
# files: * firewall22.fw /etc/fw/firewall22.fw
# files: firewall22.conf /etc/fw/firewall22.conf
@ -80,7 +80,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 22:28:01 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:35 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:01 2011 PST by vadim
# Generated Mon Feb 14 15:52:35 2011 PST by vadim
#
# files: * firewall3.fw /etc/firewall3.fw
# files: firewall3.conf /etc/firewall3.conf
@ -159,7 +159,7 @@ configure_interfaces() {
update_addresses_of_interface "lo 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Sun Feb 13 22:28:01 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:35 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:02 2011 PST by vadim
# Generated Mon Feb 14 15:52:36 2011 PST by vadim
#
# files: * firewall33.fw /etc/fw/firewall33.fw
# files: firewall33.conf /etc/fw/firewall33.conf
@ -162,7 +162,7 @@ configure_interfaces() {
update_addresses_of_interface "lo 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Sun Feb 13 22:28:02 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:36 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:02 2011 PST by vadim
# Generated Mon Feb 14 15:52:36 2011 PST by vadim
#
# files: * firewall34.fw /etc/fw/firewall34.fw
# files: firewall34.conf /etc/fw/firewall34.conf
@ -158,7 +158,7 @@ configure_interfaces() {
update_addresses_of_interface "lo 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Sun Feb 13 22:28:02 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:36 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:03 2011 PST by vadim
# Generated Mon Feb 14 15:52:37 2011 PST by vadim
#
# files: * firewall38.fw /etc/fw/firewall38.fw
# files: firewall38.conf /etc/fw/firewall38.conf
@ -76,7 +76,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 22:28:03 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:37 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:04 2011 PST by vadim
# Generated Mon Feb 14 15:52:38 2011 PST by vadim
#
# files: * firewall39.fw pf.fw
# files: firewall39.conf pf.conf
@ -79,7 +79,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 22:28:04 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:38 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:04 2011 PST by vadim
# Generated Mon Feb 14 15:52:38 2011 PST by vadim
#
# files: * firewall4.fw pf.fw
# files: firewall4.conf /etc/fw/pf.conf
@ -77,7 +77,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 22:28:04 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:38 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:05 2011 PST by vadim
# Generated Mon Feb 14 15:52:39 2011 PST by vadim
#
# files: * firewall40-1.fw /etc/firewall40-1.fw
# files: firewall40-1.conf /etc/firewall40-1.conf
@ -176,7 +176,7 @@ configure_interfaces() {
update_addresses_of_interface "lo0 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Sun Feb 13 22:28:05 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:39 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:05 2011 PST by vadim
# Generated Mon Feb 14 15:52:39 2011 PST by vadim
#
# files: * firewall40.fw /etc/firewall40.fw
# files: firewall40.conf /etc/firewall40.conf
@ -160,7 +160,7 @@ configure_interfaces() {
update_addresses_of_interface "lo0 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Sun Feb 13 22:28:05 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:39 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:06 2011 PST by vadim
# Generated Mon Feb 14 15:52:40 2011 PST by vadim
#
# files: * firewall41.fw /etc/firewall41.fw
# files: firewall41.conf /etc/firewall41.conf
@ -163,7 +163,7 @@ configure_interfaces() {
update_addresses_of_interface "eth1 2.2.2.2/0xffffff00" ""
}
log "Activating firewall script generated Sun Feb 13 22:28:06 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:40 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:06 2011 PST by vadim
# Generated Mon Feb 14 15:52:40 2011 PST by vadim
#
# files: * firewall5.fw /etc/fw/firewall5.fw
# files: firewall5.conf /etc/fw/firewall5.conf
@ -77,7 +77,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 22:28:06 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:40 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:07 2011 PST by vadim
# Generated Mon Feb 14 15:52:41 2011 PST by vadim
#
# files: * firewall51.fw /etc/fw/firewall51.fw
# files: firewall51.conf /etc/fw/firewall51.conf
@ -80,7 +80,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 22:28:07 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:41 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:07 2011 PST by vadim
# Generated Mon Feb 14 15:52:41 2011 PST by vadim
#
# files: * firewall6.fw /etc/fw/firewall6.fw
# files: firewall6.conf /etc/fw/firewall6.conf
@ -73,7 +73,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 22:28:07 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:41 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:08 2011 PST by vadim
# Generated Mon Feb 14 15:52:42 2011 PST by vadim
#
# files: * firewall62.fw /etc/firewall62.fw
# files: firewall62.conf /etc/firewall62.conf
@ -185,7 +185,7 @@ configure_interfaces() {
update_addresses_of_interface "en1 222.222.222.222/0xffffff00" ""
}
log "Activating firewall script generated Sun Feb 13 22:28:08 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:42 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:09 2011 PST by vadim
# Generated Mon Feb 14 15:52:42 2011 PST by vadim
#
# files: * firewall63.fw /etc/fw/firewall63.fw
# files: firewall63.conf /etc/fw/firewall63.conf
@ -77,7 +77,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 22:28:09 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:42 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:09 2011 PST by vadim
# Generated Mon Feb 14 15:52:44 2011 PST by vadim
#
# files: * firewall7.fw /etc/fw/firewall7.fw
# files: firewall7.conf /etc/fw/firewall7.conf
@ -73,7 +73,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 22:28:09 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:44 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:10 2011 PST by vadim
# Generated Mon Feb 14 15:52:44 2011 PST by vadim
#
# files: * firewall70.fw /etc/fw/firewall70.fw
# files: firewall70.conf /etc/fw/firewall70.conf
@ -82,7 +82,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 22:28:10 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:44 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:11 2011 PST by vadim
# Generated Mon Feb 14 15:52:45 2011 PST by vadim
#
# files: * firewall8.fw /etc/firewall8.fw
# files: firewall8.conf /etc/firewall8.conf
@ -72,7 +72,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 22:28:11 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:45 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:12 2011 PST by vadim
# Generated Mon Feb 14 15:52:46 2011 PST by vadim
#
# files: * firewall80-4.5.fw /etc/firewall80-4.5.fw
# files: firewall80-4.5.conf /etc/firewall80-4.5.conf
@ -73,7 +73,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 22:28:12 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:46 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:11 2011 PST by vadim
# Generated Mon Feb 14 15:52:45 2011 PST by vadim
#
# files: * firewall80.fw /etc/firewall80.fw
# files: firewall80.conf /etc/firewall80.conf
@ -73,7 +73,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 22:28:11 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:45 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:12 2011 PST by vadim
# Generated Mon Feb 14 15:52:46 2011 PST by vadim
#
# files: * firewall9.fw /etc/fw/firewall9.fw
# files: firewall9.conf /etc/fw/firewall9.conf
@ -76,7 +76,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 22:28:12 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:46 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:13 2011 PST by vadim
# Generated Mon Feb 14 15:52:47 2011 PST by vadim
#
# files: * firewall91.fw /etc/fw/pf.fw
# files: firewall91.conf /etc/fw/pf.conf
@ -240,7 +240,7 @@ configure_interfaces() {
update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" ""
}
log "Activating firewall script generated Sun Feb 13 22:28:13 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:47 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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:13 2011 PST by vadim
# Generated Mon Feb 14 15:52:47 2011 PST by vadim
#
# files: * firewall92.fw /etc/fw/pf.fw
# files: firewall92.conf /etc/fw/path\ with\ space/pf.conf
@ -160,7 +160,7 @@ configure_interfaces() {
update_addresses_of_interface "em1 10.1.1.81/0xffffff00" ""
}
log "Activating firewall script generated Sun Feb 13 22:28:13 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:47 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -20894,7 +20894,7 @@
<Option name="sshArgs"></Option>
</FirewallOptions>
</Firewall>
<Firewall id="id33908X2131" host_OS="freebsd" inactive="False" lastCompiled="1296525125" lastInstalled="1271995582" lastModified="1297029288" platform="pf" version="4.7" name="firewall104" comment="bridge interface, dynamic address, shell script format" ro="False">
<Firewall id="id33908X2131" host_OS="freebsd" inactive="False" lastCompiled="1296525125" lastInstalled="1271995582" lastModified="1297725454" platform="pf" version="4.7" name="firewall104" comment="bridge interface, dynamic address, shell script format, with STP" ro="False">
<NAT id="id33972X2131" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
<RuleSetOptions/>
</NAT>
@ -20934,6 +20934,10 @@
</Interface>
<Interface id="id33926X2131" dedicated_failover="False" dyn="True" label="" mgmt="False" security_level="0" unnum="False" unprotected="False" name="bridge0" comment="" ro="False">
<InterfaceOptions>
<Option name="enable_stp">True</Option>
<Option name="iface_configure_mtu">False</Option>
<Option name="iface_mtu">1500</Option>
<Option name="iface_options"></Option>
<Option name="type">bridge</Option>
<Option name="vlan_id">0</Option>
</InterfaceOptions>
@ -21213,7 +21217,7 @@
<Option name="sshArgs"></Option>
</FirewallOptions>
</Firewall>
<Firewall id="id34447X2131" host_OS="freebsd" inactive="False" lastCompiled="1296525125" lastInstalled="1271995582" lastModified="1297029251" platform="pf" version="4.7" name="firewall106" comment="bridge interface, dynamic address, rc.conf format" ro="False">
<Firewall id="id34447X2131" host_OS="freebsd" inactive="False" lastCompiled="1296525125" lastInstalled="1271995582" lastModified="1297725471" platform="pf" version="4.7" name="firewall106" comment="bridge interface, dynamic address, rc.conf format, with STP" ro="False">
<NAT id="id34509X2131" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
<RuleSetOptions/>
</NAT>
@ -21314,6 +21318,10 @@
</Interface>
<Interface id="id34465X2131" dedicated_failover="False" dyn="True" label="" mgmt="False" security_level="0" unnum="False" unprotected="False" name="bridge0" comment="" ro="False">
<InterfaceOptions>
<Option name="enable_stp">True</Option>
<Option name="iface_configure_mtu">False</Option>
<Option name="iface_mtu">1500</Option>
<Option name="iface_options"></Option>
<Option name="type">bridge</Option>
<Option name="vlan_id">0</Option>
</InterfaceOptions>
@ -21798,6 +21806,7 @@
<Interface id="id34482X3677" dedicated_failover="False" dyn="False" label="" mgmt="False" security_level="0" unnum="False" unprotected="False" name="bridge0" comment="" ro="False">
<IPv4 id="id34489X3677" name="firewall103:bridge0:ip" comment="" ro="False" address="192.168.1.1" netmask="255.255.255.0"/>
<InterfaceOptions>
<Option name="iface_mtu">1500</Option>
<Option name="type">bridge</Option>
<Option name="vlan_id">0</Option>
</InterfaceOptions>

6
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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:16 2011 PST by vadim
# Generated Mon Feb 14 15:52:50 2011 PST by vadim
#
# files: * pf_cluster_1_openbsd-1.fw /etc/pf_cluster_1_openbsd-1.fw
# files: pf_cluster_1_openbsd-1.conf /etc/pf_cluster_1_openbsd-1.conf
@ -293,7 +293,7 @@ configure_interfaces() {
update_addresses_of_interface "lo0 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Sun Feb 13 22:28:16 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:50 2011 by vadim"
set_kernel_vars
configure_interfaces

6
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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:16 2011 PST by vadim
# Generated Mon Feb 14 15:52:51 2011 PST by vadim
#
# files: * pf_cluster_1_openbsd-2.fw /etc/pf_cluster_1_openbsd-2.fw
# files: pf_cluster_1_openbsd-2.conf /etc/pf_cluster_1_openbsd-2.conf
@ -190,7 +190,7 @@ configure_interfaces() {
update_addresses_of_interface "lo0 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Sun Feb 13 22:28:16 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:51 2011 by vadim"
set_kernel_vars
configure_interfaces

6
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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:16 2011 PST by vadim
# Generated Mon Feb 14 15:52:51 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
@ -294,7 +294,7 @@ configure_interfaces() {
update_addresses_of_interface "en1 192.168.1.2/0xffffff00" ""
}
log "Activating firewall script generated Sun Feb 13 22:28:16 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:51 2011 by vadim"
set_kernel_vars
configure_interfaces

6
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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:16 2011 PST by vadim
# Generated Mon Feb 14 15:52:51 2011 PST by vadim
#
# files: * pf_cluster_2_freebsd-2.fw /etc/pf_cluster_2_freebsd-2.fw
# files: pf_cluster_2_freebsd-2.conf /etc/pf_cluster_2_freebsd-2.conf
@ -191,7 +191,7 @@ configure_interfaces() {
update_addresses_of_interface "en1 192.168.1.3/0xffffff00" ""
}
log "Activating firewall script generated Sun Feb 13 22:28:16 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:51 2011 by vadim"
set_kernel_vars
configure_interfaces

6
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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:16 2011 PST by vadim
# Generated Mon Feb 14 15:52:51 2011 PST by vadim
#
# files: * pf_cluster_3_openbsd-3.fw /etc/pf_cluster_3_openbsd-3.fw
# files: pf_cluster_3_openbsd-3.conf /etc/pf_cluster_3_openbsd-3.conf
@ -296,7 +296,7 @@ configure_interfaces() {
update_addresses_of_interface "vlan100 172.20.0.2/0xffffff00" ""
}
log "Activating firewall script generated Sun Feb 13 22:28:16 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:51 2011 by vadim"
set_kernel_vars
configure_interfaces

6
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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:17 2011 PST by vadim
# Generated Mon Feb 14 15:52:51 2011 PST by vadim
#
# files: * pf_cluster_3_openbsd-4.fw /etc/pf_cluster_3_openbsd-4.fw
# files: pf_cluster_3_openbsd-4.conf /etc/pf_cluster_3_openbsd-4.conf
@ -194,7 +194,7 @@ configure_interfaces() {
update_addresses_of_interface "vlan100 172.20.0.3/0xffffff00" ""
}
log "Activating firewall script generated Sun Feb 13 22:28:17 2011 by vadim"
log "Activating firewall script generated Mon Feb 14 15:52:51 2011 by vadim"
set_kernel_vars
configure_interfaces

4
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.3474
# Firewall Builder fwb_pf v4.2.0.3476
#
# Generated Sun Feb 13 22:28:17 2011 PST by vadim
# Generated Mon Feb 14 15:52:51 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