From a8393d34d73e656572e9edb3d0d1cb1657c42880 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Thu, 11 Jun 2009 20:17:10 +0000 Subject: [PATCH] 2009-06-11 vadim * PolicyCompiler_iosacl_writers.cpp (PrintRule::_printRule): implemented feature request #1778536: "IOSACL - remark command". This adds support for the "remark" command in generated IOS ACL configuration. Controlled by the checkbox "Add ACL remarks" in the "Script" tab of the firewall object settings dialog. --- build_num | 2 +- doc/ChangeLog | 8 ++++++++ src/gui/iosaclAdvancedDialog.cpp | 3 +++ src/gui/iosacladvanceddialog_q.ui | 17 ++++++++++++----- src/iosacl/PolicyCompiler_iosacl_writers.cpp | 3 +++ test/iosacl/objects-for-regression-tests.fwb | 12 +++++++----- 6 files changed, 34 insertions(+), 11 deletions(-) diff --git a/build_num b/build_num index c84cbaf59..b84c7b91c 100644 --- a/build_num +++ b/build_num @@ -1 +1 @@ -#define BUILD_NUM 1049 +#define BUILD_NUM 1050 diff --git a/doc/ChangeLog b/doc/ChangeLog index 5b81f8d5b..152a9ea3a 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,11 @@ +2009-06-11 vadim + + * PolicyCompiler_iosacl_writers.cpp (PrintRule::_printRule): + implemented feature request #1778536: "IOSACL - remark command". + This adds support for the "remark" command in generated IOS + ACL configuration. Controlled by the checkbox "Add ACL remarks" + in the "Script" tab of the firewall object settings dialog. + 2009-06-09 vadim * NATCompiler_pf_writers.cpp (PrintRule::_printSrcPort): fixed bug diff --git a/src/gui/iosaclAdvancedDialog.cpp b/src/gui/iosaclAdvancedDialog.cpp index d280c09d0..58cc39f87 100644 --- a/src/gui/iosaclAdvancedDialog.cpp +++ b/src/gui/iosaclAdvancedDialog.cpp @@ -258,6 +258,9 @@ iosaclAdvancedDialog::iosaclAdvancedDialog(QWidget *parent,FWObject *o) data.registerOption( m_dialog->iosacl_include_comments, fwoptions, "iosacl_include_comments" ); + data.registerOption( m_dialog->iosacl_use_acl_remarks, fwoptions, + "iosacl_use_acl_remarks" ); + data.registerOption( m_dialog->iosacl_regroup_commands, fwoptions, "iosacl_regroup_commands" ); diff --git a/src/gui/iosacladvanceddialog_q.ui b/src/gui/iosacladvanceddialog_q.ui index d0c3c0879..c6c669ce3 100644 --- a/src/gui/iosacladvanceddialog_q.ui +++ b/src/gui/iosacladvanceddialog_q.ui @@ -22,7 +22,7 @@ - 0 + 1 @@ -228,10 +228,7 @@ workstation with this address: - - - 6 - + @@ -242,6 +239,16 @@ workstation with this address: + + + + Insert comments into generated IOSACL configuration file + + + Use ACL remarks + + + diff --git a/src/iosacl/PolicyCompiler_iosacl_writers.cpp b/src/iosacl/PolicyCompiler_iosacl_writers.cpp index cd81b29d0..f5dd991a6 100644 --- a/src/iosacl/PolicyCompiler_iosacl_writers.cpp +++ b/src/iosacl/PolicyCompiler_iosacl_writers.cpp @@ -279,6 +279,9 @@ string PolicyCompiler_iosacl::PrintRule::_printRule(PolicyRule *rule) // aclstr << endl; + if (compiler->fw->getOptionsObject()->getBool("iosacl_use_acl_remarks")) + ruleout << acl->addRemark( rule->getLabel() ); + ruleout << acl->addLine(aclstr.str()); return ruleout.str(); diff --git a/test/iosacl/objects-for-regression-tests.fwb b/test/iosacl/objects-for-regression-tests.fwb index b20200952..86529579f 100644 --- a/test/iosacl/objects-for-regression-tests.fwb +++ b/test/iosacl/objects-for-regression-tests.fwb @@ -1556,7 +1556,7 @@ - + @@ -1855,7 +1855,7 @@ - + @@ -1884,15 +1884,16 @@ - + - + - + + @@ -1927,6 +1928,7 @@ +