onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-20 18:27: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:15:23 -08:00
parent d0dc616de5
commit b5d57a740b
8 changed files with 24 additions and 8 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="3475"
BUILD_NUM="3476"
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.3475"
#define VERSION "4.2.0.3476"
#define GENERATION "4.2"

6
doc/ChangeLog
View File

@ -1,5 +1,11 @@
2011-02-14 vadim <vadim@netcitadel.com>
* OSConfigurator_freebsd.cpp (interfaceConfigLineBridge): fixes
#2092 "option "stp" should be optional in the ifconfig command
that builds bridge interface for FreeBSD". The dialog provides
checkbox "Enable STP", parameter "stp" will be added to the
ifconfig command only when the checkbox is turned on.
* pfAdvancedDialog.cpp (pfAdvancedDialog): fixes #1866 "support
for pf option set state-policy", #1868 "support for pf
option set block-policy", #1869 "support for pf option set debug".

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

@ -3,7 +3,7 @@
%define name fwbuilder
%define version 4.2.0.3475
%define version 4.2.0.3476
%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.3475-1
Version: 4.2.0.3476-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.3475
%define version 4.2.0.3476
%define release 1
%if "%_vendor" == "MandrakeSoft"

8
src/libgui/bsdIfaceOptsDialog.cpp
View File

@ -162,8 +162,12 @@ void bsdIfaceOptsDialog::typeChanged(const QString&)
m_dialog->options_stack->setCurrentIndex(2);
return;
}
// there is also page 3 for bridge (with just "enable stp"
// checkbox) but we dont use it yet
if (new_type == "bridge")
{
m_dialog->options_stack->setCurrentIndex(3);
return;
}
// page 0 is empty
m_dialog->options_stack->setCurrentIndex(0);

8
src/pflib/OSConfigurator_freebsd.cpp
View File

@ -336,11 +336,17 @@ void OSConfigurator_freebsd::interfaceConfigLineBridge(Interface *iface,
FWOptions* options = fw->getOptionsObject();
if (options->getBool("generate_rc_conf_file"))
{
FWOptions *ifopt = iface->getOptionsObject();
assert(ifopt != NULL);
bool enable_stp = ifopt->getBool("enable_stp");
QStringList outp;
QStringList bp;
foreach(QString bridge_port, bridge_port_names)
{
bp << QString("addm %1 stp %2").arg(bridge_port).arg(bridge_port);
bp << QString("addm %1 %2 %3")
.arg(bridge_port).arg((enable_stp)?"stp":"").arg(bridge_port);
}
bp << "up";