onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2025-10-16 23:47:46 +02:00
Code Issues Releases Wiki Activity

see 2058 fixed mtu configuration commands generated for FreeBSD in shell script mode

Browse Source
This commit is contained in:
Vadim Kurland 2011-02-14 10:44:04 -08:00
parent 9ae141c3ae
commit 143594ddc7
75 changed files with 207 additions and 187 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="3474"
BUILD_NUM="3475"
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.3474"
#define VERSION "4.2.0.3475"
#define GENERATION "4.2"

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

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

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.3474-1
Version: 4.2.0.3475-1
Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15
Description: Firewall Builder GUI and policy compilers

2
packaging/fwbuilder.spec
View File

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

2
src/pflib/OSConfigurator_bsd.h
View File

@ -99,6 +99,8 @@ protected:
// this function generates additional ifconfig parameters
virtual void interfaceIfconfigLine(libfwbuilder::Interface *iface);
virtual QString interfaceIfconfigLineInternal(libfwbuilder::Interface *iface,
Configlet *configlet);
virtual QString printAllInterfaceConfigurationLines();

34
src/pflib/OSConfigurator_bsd_interfaces.cpp
View File

@ -360,12 +360,21 @@ string OSConfigurator_bsd::configureInterfaces()
void OSConfigurator_bsd::interfaceIfconfigLine(Interface *iface)
{
QString iface_name = iface->getName().c_str();
Configlet configlet(fw, "bsd", "ifconfig_interface");
configlet.removeComments();
configlet.collapseEmptyStrings(true);
QString config_lines = interfaceIfconfigLineInternal(iface, &configlet);
if (!config_lines.isEmpty())
interface_configuration_lines[iface_name] << config_lines;
}
configlet.setVariable("interface_name", iface_name);
QString OSConfigurator_bsd::interfaceIfconfigLineInternal(Interface *iface,
Configlet *configlet)
{
QString iface_name = iface->getName().c_str();
configlet->removeComments();
configlet->collapseEmptyStrings(true);
configlet->setVariable("interface_name", iface_name);
FWOptions *ifopt = iface->getOptionsObject();
assert(ifopt != NULL);
@ -374,24 +383,25 @@ void OSConfigurator_bsd::interfaceIfconfigLine(Interface *iface)
QStringList ifconfig_options;
if (ifopt->getBool("iface_configure_mtu") && ifopt->getInt("iface_mtu") > 0)
{
configlet.setVariable("have_mtu", true);
configlet.setVariable("mtu", ifopt->getInt("iface_mtu"));
configlet->setVariable("have_mtu", true);
configlet->setVariable("mtu", ifopt->getInt("iface_mtu"));
need_additional_ifconfig = true;
} else
{
configlet.setVariable("have_mtu", false);
configlet.setVariable("mtu", "");
configlet->setVariable("have_mtu", false);
configlet->setVariable("mtu", "");
}
if (!ifopt->getStr("iface_options").empty())
{
configlet.setVariable("options", ifopt->getStr("iface_options").c_str());
configlet->setVariable("options", ifopt->getStr("iface_options").c_str());
need_additional_ifconfig =true;
} else
configlet.setVariable("options", "");
configlet->setVariable("options", "");
if (need_additional_ifconfig)
interface_configuration_lines[iface_name] << configlet.expand();
if (need_additional_ifconfig) return configlet->expand();
return "";
}
void OSConfigurator_bsd::summaryConfigLineIP(QStringList , bool )

43
src/pflib/OSConfigurator_freebsd.cpp
View File

@ -201,44 +201,19 @@ void OSConfigurator_freebsd::interfaceConfigLineIP(
void OSConfigurator_freebsd::interfaceIfconfigLine(Interface *iface)
{
QString iface_name = iface->getName().c_str();
Configlet configlet(fw, "freebsd", "ifconfig_interface");
configlet.removeComments();
configlet.collapseEmptyStrings(true);
configlet.setVariable("interface_name", iface_name);
FWOptions *ifopt = iface->getOptionsObject();
assert(ifopt != NULL);
bool need_additional_ifconfig = false;
QStringList ifconfig_options;
if (ifopt->getBool("iface_configure_mtu") && ifopt->getInt("iface_mtu") > 0)
FWOptions* options = fw->getOptionsObject();
if (options->getBool("generate_rc_conf_file"))
{
configlet.setVariable("have_mtu", true);
configlet.setVariable("mtu", ifopt->getInt("iface_mtu"));
need_additional_ifconfig = true;
Configlet configlet(fw, "freebsd", "rc_conf_ifconfig_interface");
QString config_lines = interfaceIfconfigLineInternal(iface, &configlet);
if (!config_lines.isEmpty()) ifconfig_lines[iface_name] << config_lines;
} else
{
configlet.setVariable("have_mtu", false);
configlet.setVariable("mtu", "");
Configlet configlet(fw, "freebsd", "ifconfig_interface");
QString config_lines = interfaceIfconfigLineInternal(iface, &configlet);
if (!config_lines.isEmpty())
interface_configuration_lines[iface_name] << config_lines;
}
if (!ifopt->getStr("iface_options").empty())
{
configlet.setVariable("options", ifopt->getStr("iface_options").c_str());
need_additional_ifconfig =true;
} else
configlet.setVariable("options", "");
// unlike in virtual function in the parent class
// OSConfigurator_bsd, here we add generated strings to
// ifconfig_lines that will be used to compose
// "ifconfig_<interface>" variable later in
// printAllInterfaceConfigurationLines()
if (need_additional_ifconfig)
ifconfig_lines[iface_name] << configlet.expand();
}
void OSConfigurator_freebsd::summaryConfigLineVlan(QStringList vlan_names)

2
src/res/configlets/freebsd/ifconfig_interface
View File

@ -5,5 +5,5 @@
## using single "#", these will appear in the script.
##
{{if have_mtu}}mtu {{$mtu}}{{endif}} {{$options}}
$IFCONFIG {{$interface_name}} {{if have_mtu}}mtu {{$mtu}}{{endif}} {{$options}}

9
src/res/configlets/freebsd/rc_conf_ifconfig_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.
##
{{if have_mtu}}mtu {{$mtu}}{{endif}} {{$options}}

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:27 2011 PST by vadim
# Generated Sun Feb 13 22:28:14 2011 PST by vadim
#
# files: * firewall-base-rulesets.fw /etc/fw/firewall-base-rulesets.fw
# files: firewall-base-rulesets.conf /etc/fw/firewall-base-rulesets.conf
@ -163,7 +163,7 @@ configure_interfaces() {
update_addresses_of_interface "en2 192.168.100.1/0xffffff00" ""
}
log "Activating firewall script generated Sun Feb 13 18:01:27 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:14 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:27 2011 PST by vadim
# Generated Sun Feb 13 22:28:14 2011 PST by vadim
#
# files: * firewall-ipv6-1.fw pf-ipv6.fw
# files: firewall-ipv6-1.conf /etc/fw/pf-ipv6.conf
@ -175,7 +175,7 @@ configure_interfaces() {
update_addresses_of_interface "lo ::1/128 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Sun Feb 13 18:01:27 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:14 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:28 2011 PST by vadim
# Generated Sun Feb 13 22:28:16 2011 PST by vadim
#
# files: * firewall-ipv6-2.fw pf.fw
# files: firewall-ipv6-2.conf pf.conf
@ -179,7 +179,7 @@ configure_interfaces() {
update_addresses_of_interface "lo ::1/128 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Sun Feb 13 18:01:28 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:16 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -3,7 +3,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:28 2011 PST by vadim
# Generated Sun Feb 13 22:28:16 2011 PST by vadim
#
# files: * firewall-ipv6-3.fw /etc/firewall-ipv6-3.fw
# files: firewall-ipv6-3.conf /etc/firewall-ipv6-3.conf

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:00:56 2011 PST by vadim
# Generated Sun Feb 13 22:27:44 2011 PST by vadim
#
# files: * firewall.fw /etc/pf.fw
# files: firewall.conf /etc/pf.conf
@ -167,7 +167,7 @@ configure_interfaces() {
update_addresses_of_interface "lo 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Sun Feb 13 18:00:56 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:27:44 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:00:57 2011 PST by vadim
# Generated Sun Feb 13 22:27:45 2011 PST by vadim
#
# files: * firewall1.fw /etc/fw/firewall1.fw
# files: firewall1.conf /etc/fw/firewall1.conf
@ -76,7 +76,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 18:00:57 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:27:45 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:00:59 2011 PST by vadim
# Generated Sun Feb 13 22:27:46 2011 PST by vadim
#
# files: * firewall10-1.fw /etc/fw/firewall10-1.fw
# files: firewall10-1.conf /etc/fw/firewall10-1.conf
@ -74,7 +74,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 18:00:59 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:27:46 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:00 2011 PST by vadim
# Generated Sun Feb 13 22:27:47 2011 PST by vadim
#
# files: * firewall10-2.fw /etc/fw/firewall10-2.fw
# files: firewall10-2.conf /etc/fw/firewall10-2.conf
@ -74,7 +74,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 18:01:00 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:27:47 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:01 2011 PST by vadim
# Generated Sun Feb 13 22:27:48 2011 PST by vadim
#
# files: * firewall10-3.fw /etc/fw/firewall10-3.fw
# files: firewall10-3.conf /etc/fw/firewall10-3.conf
@ -76,7 +76,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 18:01:01 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:27:48 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:03 2011 PST by vadim
# Generated Sun Feb 13 22:27:51 2011 PST by vadim
#
# files: * firewall10-4.fw /etc/fw/firewall10-4.fw
# files: firewall10-4.conf /etc/fw/firewall10-4.conf
@ -76,7 +76,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 18:01:03 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:27:51 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:05 2011 PST by vadim
# Generated Sun Feb 13 22:27:52 2011 PST by vadim
#
# files: * firewall10-5.fw /etc/fw/firewall10-5.fw
# files: firewall10-5.conf /etc/fw/firewall10-5.conf
@ -77,7 +77,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 18:01:05 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:27:52 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:06 2011 PST by vadim
# Generated Sun Feb 13 22:27:53 2011 PST by vadim
#
# files: * firewall10-6.fw /etc/fw/firewall10-6.fw
# files: firewall10-6.conf /etc/fw/firewall10-6.conf
@ -77,7 +77,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 18:01:06 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:27:53 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:00:58 2011 PST by vadim
# Generated Sun Feb 13 22:27:45 2011 PST by vadim
#
# files: * firewall100.fw /etc/fw/pf.fw
# files: firewall100.conf /etc/fw/path\ with\ space/pf.conf
@ -157,10 +157,11 @@ run_epilog_and_exit() {
configure_interfaces() {
:
update_addresses_of_interface "em0 10.3.14.81/0xffffff00" ""
$IFCONFIG em0 mtu 1490
update_addresses_of_interface "em1 10.1.1.81/0xffffff00" ""
}
log "Activating firewall script generated Sun Feb 13 18:00:58 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:27:45 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:00:58 2011 PST by vadim
# Generated Sun Feb 13 22:27:46 2011 PST by vadim
#
# files: * firewall101.fw /etc/fw/pf.fw
# files: firewall101.conf /etc/fw/path\ with\ space/pf.conf
@ -160,10 +160,11 @@ run_epilog_and_exit() {
configure_interfaces() {
:
update_addresses_of_interface "em0 10.3.14.81/0xffffff00" ""
$IFCONFIG em0 mtu 1490
update_addresses_of_interface "em1 10.1.1.81/0xffffff00" ""
}
log "Activating firewall script generated Sun Feb 13 18:00:58 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:27:46 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -3,7 +3,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:00:59 2011 PST by vadim
# Generated Sun Feb 13 22:27:47 2011 PST by vadim
#
# files: * firewall102.fw /etc/fw/pf.fw
# files: firewall102.conf /etc/fw/path\ with\ space/pf.conf
@ -21,7 +21,7 @@ gateway_enable="YES"
network_interfaces="em0 em1"
ifconfig_em0="10.3.14.81 netmask 0xffffff00"
ifconfig_em0="10.3.14.81 netmask 0xffffff00 mtu 1490 "
ifconfig_em1="10.1.1.81 netmask 0xffffff00"
pf_enable="YES"

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:01 2011 PST by vadim
# Generated Sun Feb 13 22:27:49 2011 PST by vadim
#
# files: * firewall103-1.fw /etc/fw/pf.fw
# files: firewall103-1.conf /etc/fw/path\ with\ space/pf.conf
@ -385,7 +385,7 @@ configure_interfaces() {
update_addresses_of_interface "em3" ""
}
log "Activating firewall script generated Sun Feb 13 18:01:01 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:27:49 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:02 2011 PST by vadim
# Generated Sun Feb 13 22:27:49 2011 PST by vadim
#
# files: * firewall103-2.fw /etc/fw/pf.fw
# files: firewall103-2.conf /etc/fw/path\ with\ space/pf.conf
@ -385,7 +385,7 @@ configure_interfaces() {
update_addresses_of_interface "em3" ""
}
log "Activating firewall script generated Sun Feb 13 18:01:02 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:27:49 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:00 2011 PST by vadim
# Generated Sun Feb 13 22:27:48 2011 PST by vadim
#
# files: * firewall103.fw /etc/fw/pf.fw
# files: firewall103.conf /etc/fw/path\ with\ space/pf.conf
@ -388,7 +388,7 @@ configure_interfaces() {
update_addresses_of_interface "em3" ""
}
log "Activating firewall script generated Sun Feb 13 18:01:00 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:27:48 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:03 2011 PST by vadim
# Generated Sun Feb 13 22:27:51 2011 PST by vadim
#
# files: * firewall104-1.fw /etc/fw/pf.fw
# files: firewall104-1.conf /etc/fw/path\ with\ space/pf.conf
@ -384,7 +384,7 @@ configure_interfaces() {
update_addresses_of_interface "em3" ""
}
log "Activating firewall script generated Sun Feb 13 18:01:03 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:27:51 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:02 2011 PST by vadim
# Generated Sun Feb 13 22:27:50 2011 PST by vadim
#
# files: * firewall104.fw /etc/fw/pf.fw
# files: firewall104.conf /etc/fw/path\ with\ space/pf.conf
@ -387,7 +387,7 @@ configure_interfaces() {
update_addresses_of_interface "em3" ""
}
log "Activating firewall script generated Sun Feb 13 18:01:02 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:27:50 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -3,7 +3,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:04 2011 PST by vadim
# Generated Sun Feb 13 22:27:52 2011 PST by vadim
#
# files: * firewall105.fw /etc/fw/pf.fw
# files: firewall105.conf /etc/fw/path\ with\ space/pf.conf

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

@ -3,7 +3,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:05 2011 PST by vadim
# Generated Sun Feb 13 22:27:53 2011 PST by vadim
#
# files: * firewall106.fw /etc/fw/pf.fw
# files: firewall106.conf /etc/fw/path\ with\ space/pf.conf

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:06 2011 PST by vadim
# Generated Sun Feb 13 22:27:54 2011 PST by vadim
#
# files: * firewall107.fw /etc/fw/pf.fw
# files: firewall107.conf /etc/fw/path\ with\ space/pf.conf
@ -388,7 +388,7 @@ configure_interfaces() {
update_addresses_of_interface "vlan102 192.168.102.1/0xffffff00" ""
}
log "Activating firewall script generated Sun Feb 13 18:01:06 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:27:54 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -3,7 +3,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:07 2011 PST by vadim
# Generated Sun Feb 13 22:27:54 2011 PST by vadim
#
# files: * firewall108.fw /etc/fw/pf.fw
# files: firewall108.conf /etc/fw/path\ with\ space/pf.conf

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:07 2011 PST by vadim
# Generated Sun Feb 13 22:27:55 2011 PST by vadim
#
# files: * firewall11.fw /etc/firewall11.fw
# files: firewall11.conf /etc/firewall11.conf
@ -77,7 +77,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 18:01:07 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:27:55 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:08 2011 PST by vadim
# Generated Sun Feb 13 22:27:55 2011 PST by vadim
#
# files: * firewall110.fw /etc/fw/firewall110.fw
# files: firewall110.conf /etc/fw/firewall110.conf
@ -76,7 +76,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 18:01:08 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:27:55 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:08 2011 PST by vadim
# Generated Sun Feb 13 22:27:56 2011 PST by vadim
#
# files: * firewall12.fw /etc/fw/firewall12.fw
# files: firewall12.conf /etc/fw/firewall12.conf
@ -159,7 +159,7 @@ configure_interfaces() {
update_addresses_of_interface "lo0 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Sun Feb 13 18:01:08 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:27:56 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:09 2011 PST by vadim
# Generated Sun Feb 13 22:27:56 2011 PST by vadim
#
# files: * firewall13.fw /etc/fw/firewall13.fw
# files: firewall13.conf /etc/fw/firewall13.conf
@ -88,7 +88,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 18:01:09 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:27:56 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:10 2011 PST by vadim
# Generated Sun Feb 13 22:27:58 2011 PST by vadim
#
# files: * firewall14-1.fw /etc/firewall14-1.fw
# files: firewall14-1.conf /etc/firewall14-1.conf
@ -241,7 +241,7 @@ configure_interfaces() {
update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" ""
}
log "Activating firewall script generated Sun Feb 13 18:01:10 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:27:58 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:09 2011 PST by vadim
# Generated Sun Feb 13 22:27:57 2011 PST by vadim
#
# files: * firewall14.fw /etc/firewall14.fw
# files: firewall14.conf /etc/firewall14.conf
@ -241,7 +241,7 @@ configure_interfaces() {
update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" ""
}
log "Activating firewall script generated Sun Feb 13 18:01:09 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:27:57 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:12 2011 PST by vadim
# Generated Sun Feb 13 22:28:00 2011 PST by vadim
#
# files: * firewall2-1.fw /etc/fw/firewall2-1.fw
# files: firewall2-1.conf /etc/fw/firewall2-1.conf
@ -88,7 +88,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 18:01:12 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:00 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:11 2011 PST by vadim
# Generated Sun Feb 13 22:27:58 2011 PST by vadim
#
# files: * firewall2.fw /etc/fw/firewall2.fw
# files: firewall2.conf /etc/fw/firewall2.conf
@ -73,7 +73,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 18:01:11 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:27:58 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:11 2011 PST by vadim
# Generated Sun Feb 13 22:27:59 2011 PST by vadim
#
# files: * firewall20.fw /etc/fw/firewall20.fw
# files: firewall20.conf /etc/fw/firewall20.conf
@ -73,7 +73,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 18:01:11 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:27:59 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:12 2011 PST by vadim
# Generated Sun Feb 13 22:27:59 2011 PST by vadim
#
# files: * firewall21.fw /etc/fw/firewall21.fw
# files: firewall21.conf /etc/fw/firewall21.conf
@ -81,7 +81,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 18:01:12 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:27:59 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:13 2011 PST by vadim
# Generated Sun Feb 13 22:28:01 2011 PST by vadim
#
# files: * firewall22.fw /etc/fw/firewall22.fw
# files: firewall22.conf /etc/fw/firewall22.conf
@ -80,7 +80,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 18:01:13 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:01 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:13 2011 PST by vadim
# Generated Sun Feb 13 22:28:01 2011 PST by vadim
#
# files: * firewall3.fw /etc/firewall3.fw
# files: firewall3.conf /etc/firewall3.conf
@ -159,7 +159,7 @@ configure_interfaces() {
update_addresses_of_interface "lo 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Sun Feb 13 18:01:13 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:01 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:15 2011 PST by vadim
# Generated Sun Feb 13 22:28:02 2011 PST by vadim
#
# files: * firewall33.fw /etc/fw/firewall33.fw
# files: firewall33.conf /etc/fw/firewall33.conf
@ -162,7 +162,7 @@ configure_interfaces() {
update_addresses_of_interface "lo 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Sun Feb 13 18:01:15 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:02 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:14 2011 PST by vadim
# Generated Sun Feb 13 22:28:02 2011 PST by vadim
#
# files: * firewall34.fw /etc/fw/firewall34.fw
# files: firewall34.conf /etc/fw/firewall34.conf
@ -158,7 +158,7 @@ configure_interfaces() {
update_addresses_of_interface "lo 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Sun Feb 13 18:01:14 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:02 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:15 2011 PST by vadim
# Generated Sun Feb 13 22:28:03 2011 PST by vadim
#
# files: * firewall38.fw /etc/fw/firewall38.fw
# files: firewall38.conf /etc/fw/firewall38.conf
@ -76,7 +76,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 18:01:15 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:03 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:16 2011 PST by vadim
# Generated Sun Feb 13 22:28:04 2011 PST by vadim
#
# files: * firewall39.fw pf.fw
# files: firewall39.conf pf.conf
@ -79,7 +79,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 18:01:16 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:04 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:17 2011 PST by vadim
# Generated Sun Feb 13 22:28:04 2011 PST by vadim
#
# files: * firewall4.fw pf.fw
# files: firewall4.conf /etc/fw/pf.conf
@ -77,7 +77,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 18:01:17 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:04 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:18 2011 PST by vadim
# Generated Sun Feb 13 22:28:05 2011 PST by vadim
#
# files: * firewall40-1.fw /etc/firewall40-1.fw
# files: firewall40-1.conf /etc/firewall40-1.conf
@ -176,7 +176,7 @@ configure_interfaces() {
update_addresses_of_interface "lo0 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Sun Feb 13 18:01:18 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:05 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:17 2011 PST by vadim
# Generated Sun Feb 13 22:28:05 2011 PST by vadim
#
# files: * firewall40.fw /etc/firewall40.fw
# files: firewall40.conf /etc/firewall40.conf
@ -160,7 +160,7 @@ configure_interfaces() {
update_addresses_of_interface "lo0 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Sun Feb 13 18:01:17 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:05 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:18 2011 PST by vadim
# Generated Sun Feb 13 22:28:06 2011 PST by vadim
#
# files: * firewall41.fw /etc/firewall41.fw
# files: firewall41.conf /etc/firewall41.conf
@ -163,7 +163,7 @@ configure_interfaces() {
update_addresses_of_interface "eth1 2.2.2.2/0xffffff00" ""
}
log "Activating firewall script generated Sun Feb 13 18:01:18 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:06 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:19 2011 PST by vadim
# Generated Sun Feb 13 22:28:06 2011 PST by vadim
#
# files: * firewall5.fw /etc/fw/firewall5.fw
# files: firewall5.conf /etc/fw/firewall5.conf
@ -77,7 +77,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 18:01:19 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:06 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:20 2011 PST by vadim
# Generated Sun Feb 13 22:28:07 2011 PST by vadim
#
# files: * firewall51.fw /etc/fw/firewall51.fw
# files: firewall51.conf /etc/fw/firewall51.conf
@ -80,7 +80,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 18:01:20 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:07 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:20 2011 PST by vadim
# Generated Sun Feb 13 22:28:07 2011 PST by vadim
#
# files: * firewall6.fw /etc/fw/firewall6.fw
# files: firewall6.conf /etc/fw/firewall6.conf
@ -73,7 +73,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 18:01:20 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:07 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:21 2011 PST by vadim
# Generated Sun Feb 13 22:28:08 2011 PST by vadim
#
# files: * firewall62.fw /etc/firewall62.fw
# files: firewall62.conf /etc/firewall62.conf
@ -185,7 +185,7 @@ configure_interfaces() {
update_addresses_of_interface "en1 222.222.222.222/0xffffff00" ""
}
log "Activating firewall script generated Sun Feb 13 18:01:21 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:08 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:21 2011 PST by vadim
# Generated Sun Feb 13 22:28:09 2011 PST by vadim
#
# files: * firewall63.fw /etc/fw/firewall63.fw
# files: firewall63.conf /etc/fw/firewall63.conf
@ -77,7 +77,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 18:01:21 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:09 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:22 2011 PST by vadim
# Generated Sun Feb 13 22:28:09 2011 PST by vadim
#
# files: * firewall7.fw /etc/fw/firewall7.fw
# files: firewall7.conf /etc/fw/firewall7.conf
@ -73,7 +73,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 18:01:22 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:09 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:22 2011 PST by vadim
# Generated Sun Feb 13 22:28:10 2011 PST by vadim
#
# files: * firewall70.fw /etc/fw/firewall70.fw
# files: firewall70.conf /etc/fw/firewall70.conf
@ -82,7 +82,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 18:01:22 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:10 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:23 2011 PST by vadim
# Generated Sun Feb 13 22:28:11 2011 PST by vadim
#
# files: * firewall8.fw /etc/firewall8.fw
# files: firewall8.conf /etc/firewall8.conf
@ -72,7 +72,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 18:01:23 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:11 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:24 2011 PST by vadim
# Generated Sun Feb 13 22:28:12 2011 PST by vadim
#
# files: * firewall80-4.5.fw /etc/firewall80-4.5.fw
# files: firewall80-4.5.conf /etc/firewall80-4.5.conf
@ -73,7 +73,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 18:01:24 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:12 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:23 2011 PST by vadim
# Generated Sun Feb 13 22:28:11 2011 PST by vadim
#
# files: * firewall80.fw /etc/firewall80.fw
# files: firewall80.conf /etc/firewall80.conf
@ -73,7 +73,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 18:01:23 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:11 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:24 2011 PST by vadim
# Generated Sun Feb 13 22:28:12 2011 PST by vadim
#
# files: * firewall9.fw /etc/fw/firewall9.fw
# files: firewall9.conf /etc/fw/firewall9.conf
@ -76,7 +76,7 @@ configure_interfaces() {
}
log "Activating firewall script generated Sun Feb 13 18:01:24 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:12 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:25 2011 PST by vadim
# Generated Sun Feb 13 22:28:13 2011 PST by vadim
#
# files: * firewall91.fw /etc/fw/pf.fw
# files: firewall91.conf /etc/fw/pf.conf
@ -240,7 +240,7 @@ configure_interfaces() {
update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" ""
}
log "Activating firewall script generated Sun Feb 13 18:01:25 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:13 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:26 2011 PST by vadim
# Generated Sun Feb 13 22:28:13 2011 PST by vadim
#
# files: * firewall92.fw /etc/fw/pf.fw
# files: firewall92.conf /etc/fw/path\ with\ space/pf.conf
@ -160,7 +160,7 @@ configure_interfaces() {
update_addresses_of_interface "em1 10.1.1.81/0xffffff00" ""
}
log "Activating firewall script generated Sun Feb 13 18:01:26 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:13 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -19855,7 +19855,7 @@
<Option name="sshArgs"></Option>
</FirewallOptions>
</Firewall>
<Firewall id="id32636X21143" host_OS="openbsd" inactive="False" lastCompiled="1296525125" lastInstalled="1271995582" lastModified="1296525645" platform="pf" version="4.7" name="firewall100" comment="routing rules" ro="False">
<Firewall id="id32636X21143" host_OS="openbsd" inactive="False" lastCompiled="1296525125" lastInstalled="1271995582" lastModified="1297661451" platform="pf" version="4.7" name="firewall100" comment="routing rules" ro="False">
<NAT id="id32797X21143" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
<RuleSetOptions/>
</NAT>
@ -19948,7 +19948,14 @@
</Routing>
<Interface id="id32644X21143" dedicated_failover="False" dyn="False" label="" mgmt="True" security_level="100" unnum="False" unprotected="False" name="em0" comment="" ro="False">
<IPv4 id="id32647X21143" name="firewall100:em0:ip" comment="" ro="False" address="10.3.14.81" netmask="255.255.255.0"/>
<InterfaceOptions/>
<InterfaceOptions>
<Option name="enable_stp">False</Option>
<Option name="iface_configure_mtu">True</Option>
<Option name="iface_mtu">1490</Option>
<Option name="iface_options"></Option>
<Option name="type">ethernet</Option>
<Option name="vlan_id">0</Option>
</InterfaceOptions>
</Interface>
<Interface id="id32649X21143" dedicated_failover="False" dyn="False" label="" security_level="100" unnum="False" unprotected="False" name="em1" comment="" ro="False">
<IPv4 id="id32652X21143" name="firewall100:em1:ip" comment="" ro="False" address="10.1.1.81" netmask="255.255.255.0"/>
@ -20306,7 +20313,7 @@
<Option name="verify_interfaces">True</Option>
</FirewallOptions>
</Firewall>
<Firewall id="id33080X19696" host_OS="freebsd" inactive="False" lastCompiled="1296525125" lastInstalled="1271995582" lastModified="1296863983" platform="pf" version="4.7" name="firewall101" comment="routing rules, shell script format" ro="False">
<Firewall id="id33080X19696" host_OS="freebsd" inactive="False" lastCompiled="1296525125" lastInstalled="1271995582" lastModified="1297661513" platform="pf" version="4.7" name="firewall101" comment="routing rules, shell script format" ro="False">
<NAT id="id33129X19696" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
<RuleSetOptions/>
</NAT>
@ -20399,7 +20406,14 @@
</Routing>
<Interface id="id33088X19696" dedicated_failover="False" dyn="False" label="" mgmt="True" security_level="100" unnum="False" unprotected="False" name="em0" comment="" ro="False">
<IPv4 id="id33091X19696" name="firewall101:em0:ip" comment="" ro="False" address="10.3.14.81" netmask="255.255.255.0"/>
<InterfaceOptions/>
<InterfaceOptions>
<Option name="enable_stp">False</Option>
<Option name="iface_configure_mtu">True</Option>
<Option name="iface_mtu">1490</Option>
<Option name="iface_options"></Option>
<Option name="type">ethernet</Option>
<Option name="vlan_id">0</Option>
</InterfaceOptions>
</Interface>
<Interface id="id33093X19696" dedicated_failover="False" dyn="False" label="" security_level="100" unnum="False" unprotected="False" name="em1" comment="" ro="False">
<IPv4 id="id33096X19696" name="firewall101:em1:ip" comment="" ro="False" address="10.1.1.81" netmask="255.255.255.0"/>
@ -20420,6 +20434,7 @@
<Option name="compiler"></Option>
<Option name="conf1_file"></Option>
<Option name="conf_file_name_on_firewall">/etc/fw/path with space/pf.conf</Option>
<Option name="configure_bridge_interfaces">False</Option>
<Option name="configure_carp_interfaces">False</Option>
<Option name="configure_interfaces">True</Option>
<Option name="configure_pfsync_interfaces">False</Option>
@ -20509,7 +20524,7 @@
<Option name="sshArgs"></Option>
</FirewallOptions>
</Firewall>
<Firewall id="id33316X5965" host_OS="freebsd" inactive="False" lastCompiled="1296525125" lastInstalled="1271995582" lastModified="1297029360" platform="pf" version="4.7" name="firewall102" comment="routing rules, rc.conf format" ro="False">
<Firewall id="id33316X5965" host_OS="freebsd" inactive="False" lastCompiled="1296525125" lastInstalled="1271995582" lastModified="1297661443" platform="pf" version="4.7" name="firewall102" comment="routing rules, rc.conf format" ro="False">
<NAT id="id33365X5965" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
<RuleSetOptions/>
</NAT>
@ -20602,7 +20617,14 @@
</Routing>
<Interface id="id33324X5965" dedicated_failover="False" dyn="False" label="" mgmt="True" security_level="100" unnum="False" unprotected="False" name="em0" comment="" ro="False">
<IPv4 id="id33327X5965" name="firewall102:em0:ip" comment="" ro="False" address="10.3.14.81" netmask="255.255.255.0"/>
<InterfaceOptions/>
<InterfaceOptions>
<Option name="enable_stp">False</Option>
<Option name="iface_configure_mtu">True</Option>
<Option name="iface_mtu">1490</Option>
<Option name="iface_options"></Option>
<Option name="type">ethernet</Option>
<Option name="vlan_id">0</Option>
</InterfaceOptions>
</Interface>
<Interface id="id33329X5965" dedicated_failover="False" dyn="False" label="" security_level="100" unnum="False" unprotected="False" name="em1" comment="" ro="False">
<IPv4 id="id33332X5965" name="firewall102:em1:ip" comment="" ro="False" address="10.1.1.81" netmask="255.255.255.0"/>

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:29 2011 PST by vadim
# Generated Sun Feb 13 22:28:16 2011 PST by vadim
#
# files: * pf_cluster_1_openbsd-1.fw /etc/pf_cluster_1_openbsd-1.fw
# files: pf_cluster_1_openbsd-1.conf /etc/pf_cluster_1_openbsd-1.conf
@ -293,7 +293,7 @@ configure_interfaces() {
update_addresses_of_interface "lo0 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Sun Feb 13 18:01:29 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:16 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:29 2011 PST by vadim
# Generated Sun Feb 13 22:28:16 2011 PST by vadim
#
# files: * pf_cluster_1_openbsd-2.fw /etc/pf_cluster_1_openbsd-2.fw
# files: pf_cluster_1_openbsd-2.conf /etc/pf_cluster_1_openbsd-2.conf
@ -190,7 +190,7 @@ configure_interfaces() {
update_addresses_of_interface "lo0 127.0.0.1/0xff000000" ""
}
log "Activating firewall script generated Sun Feb 13 18:01:29 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:16 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:29 2011 PST by vadim
# Generated Sun Feb 13 22:28:16 2011 PST by vadim
#
# files: * pf_cluster_2_freebsd-1.fw /etc/pf_cluster_2_freebsd-1.fw
# files: pf_cluster_2_freebsd-1.conf /etc/pf_cluster_2_freebsd-1.conf
@ -284,9 +284,9 @@ configure_interfaces() {
sync_vlan_interfaces
sync_carp_interfaces carp0 carp1
sync_pfsync_interfaces pfsync0
$IFCONFIG carp0 vhid 101 pass secret advskew 5 carpdev en0
$IFCONFIG carp0 vhid 101 pass secret advskew 5
update_addresses_of_interface "carp0 172.24.0.1/0xffffff00 172.24.0.1/0xffffff00" ""
$IFCONFIG carp1 vhid 100 pass secret advskew 5 carpdev en1
$IFCONFIG carp1 vhid 100 pass secret advskew 5
update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" ""
update_addresses_of_interface "en0 172.24.0.2/0xffffff00" ""
$IFCONFIG pfsync0 syncdev en0
@ -294,7 +294,7 @@ configure_interfaces() {
update_addresses_of_interface "en1 192.168.1.2/0xffffff00" ""
}
log "Activating firewall script generated Sun Feb 13 18:01:29 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:16 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:29 2011 PST by vadim
# Generated Sun Feb 13 22:28:16 2011 PST by vadim
#
# files: * pf_cluster_2_freebsd-2.fw /etc/pf_cluster_2_freebsd-2.fw
# files: pf_cluster_2_freebsd-2.conf /etc/pf_cluster_2_freebsd-2.conf
@ -183,15 +183,15 @@ run_epilog_and_exit() {
configure_interfaces() {
:
sync_carp_interfaces carp0 carp1
$IFCONFIG carp0 vhid 101 pass secret advskew 10 carpdev en0
$IFCONFIG carp0 vhid 101 pass secret advskew 10
update_addresses_of_interface "carp0 172.24.0.1/0xffffff00 172.24.0.1/0xffffff00" ""
$IFCONFIG carp1 vhid 100 pass secret advskew 10 carpdev en1
$IFCONFIG carp1 vhid 100 pass secret advskew 10
update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" ""
update_addresses_of_interface "en0 172.24.0.3/0xffffff00" ""
update_addresses_of_interface "en1 192.168.1.3/0xffffff00" ""
}
log "Activating firewall script generated Sun Feb 13 18:01:29 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:16 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:29 2011 PST by vadim
# Generated Sun Feb 13 22:28:16 2011 PST by vadim
#
# files: * pf_cluster_3_openbsd-3.fw /etc/pf_cluster_3_openbsd-3.fw
# files: pf_cluster_3_openbsd-3.conf /etc/pf_cluster_3_openbsd-3.conf
@ -296,7 +296,7 @@ configure_interfaces() {
update_addresses_of_interface "vlan100 172.20.0.2/0xffffff00" ""
}
log "Activating firewall script generated Sun Feb 13 18:01:29 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:16 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -4,7 +4,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:29 2011 PST by vadim
# Generated Sun Feb 13 22:28:17 2011 PST by vadim
#
# files: * pf_cluster_3_openbsd-4.fw /etc/pf_cluster_3_openbsd-4.fw
# files: pf_cluster_3_openbsd-4.conf /etc/pf_cluster_3_openbsd-4.conf
@ -194,7 +194,7 @@ configure_interfaces() {
update_addresses_of_interface "vlan100 172.20.0.3/0xffffff00" ""
}
log "Activating firewall script generated Sun Feb 13 18:01:29 2011 by vadim"
log "Activating firewall script generated Sun Feb 13 22:28:17 2011 by vadim"
set_kernel_vars
configure_interfaces

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

@ -3,7 +3,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3474
#
# Generated Sun Feb 13 18:01:29 2011 PST by vadim
# Generated Sun Feb 13 22:28:17 2011 PST by vadim
#
# files: * pf_cluster_4_rc.conf.local /etc/pf_cluster_4_rc.conf.local
# files: pf_cluster_4_pf.conf /etc/pf_cluster_4_pf.conf
@ -19,9 +19,9 @@ gateway_enable="YES"
cloned_interfaces="carp0 carp1"
network_interfaces="carp0 carp1 en0 en1"
ifconfig_carp0="vhid 101 pass secret advskew 10 carpdev en0"
ifconfig_carp0="vhid 101 pass secret advskew 10"
ifconfig_carp0="172.24.0.1 netmask 0xffffff00"
ifconfig_carp1="vhid 100 pass secret advskew 10 carpdev en1"
ifconfig_carp1="vhid 100 pass secret advskew 10"
ifconfig_carp1="192.168.1.1 netmask 0xffffff00"
pfsync_syncdev="en0"
pfsync_syncpeer="172.24.0.2"