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

* parsers/pix.g (icmp_top_level_command): see #2164 policy rules created from import of ssh, telnet and icmp commands should be on top; build 3510

Browse Source
This commit is contained in:
Vadim Kurland 2011-03-25 19:41:01 -07:00
parent 60d0c4e308
commit 8023a23dfb
6 changed files with 25 additions and 6 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 # build number is like "nano" version number. I am incrementing build
# number during development cycle # number during development cycle
# #
BUILD_NUM="3509" BUILD_NUM="3510"
VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM" 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.3509" #define VERSION "4.2.0.3510"
#define GENERATION "4.2" #define GENERATION "4.2"

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

@ -3,7 +3,7 @@
%define name fwbuilder %define name fwbuilder
%define version 4.2.0.3509 %define version 4.2.0.3510
%define release 1 %define release 1
%if "%_vendor" == "MandrakeSoft" %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 Priority: extra
Section: checkinstall Section: checkinstall
Maintainer: vadim@fwbuilder.org Maintainer: vadim@fwbuilder.org
Version: 4.2.0.3509-1 Version: 4.2.0.3510-1
Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15 Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15
Description: Firewall Builder GUI and policy compilers Description: Firewall Builder GUI and policy compilers

2
packaging/fwbuilder.spec
View File

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

21
src/import/PIXImporter.cpp
View File

@ -249,6 +249,14 @@ void PIXImporter::rearrangeVlanInterfaces()
} }
bool compare_ruleset_names(string a, string b)
{
if (a.find("ssh_commands") == 0) return true;
if (a.find("telnet_commands") == 0) return true;
if (a.find("icmp_commands") == 0) return true;
return a < b;
}
Firewall* PIXImporter::finalize() Firewall* PIXImporter::finalize()
{ {
// scan all UnidirectionalRuleSet objects, set interface and // scan all UnidirectionalRuleSet objects, set interface and
@ -282,10 +290,21 @@ Firewall* PIXImporter::finalize()
qDebug() << "all_rulesets.size()=" << all_rulesets.size(); qDebug() << "all_rulesets.size()=" << all_rulesets.size();
} }
list<string> ruleset_names;
std::map<const std::string,UnidirectionalRuleSet*>::iterator i; std::map<const std::string,UnidirectionalRuleSet*>::iterator i;
for (i=all_rulesets.begin(); i!=all_rulesets.end(); ++i) for (i=all_rulesets.begin(); i!=all_rulesets.end(); ++i)
{ {
UnidirectionalRuleSet *irs = (*i).second; ruleset_names.push_back((*i).first);
}
// sort rule sets by name, making sure "ssh_commands_*",
// "telnet_commands_*" and "icmp_commands_*" stay on top
ruleset_names.sort(compare_ruleset_names);
list<string>::iterator it;
for (it=ruleset_names.begin(); it!=ruleset_names.end(); ++it)
{
UnidirectionalRuleSet *irs = all_rulesets[*it];
if (fwbdebug) if (fwbdebug)
{ {