From cedb9620bd1eef1cb6c62b35fd3b4e6c065b05dc Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Mon, 17 May 2010 20:36:48 +0000 Subject: [PATCH] * PolicyCompiler_iosacl_writers.cpp (PrintRule::_printRule): restored function of the "comment the code" in the "Script options" of the firewall settings dialog for Cisco IOS ACL and ProCurve ACL. When this checkbox is off, comments are not added to generated script. --- build_num | 2 +- doc/ChangeLog | 6 ++++++ src/cisco_lib/PolicyCompiler_iosacl_writers.cpp | 14 +++++++------- test/procurve_acl/objects-for-regression-tests.fwb | 13 +++++++------ 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/build_num b/build_num index 5a0b9cfb6..4536f5c55 100644 --- a/build_num +++ b/build_num @@ -1 +1 @@ -#define BUILD_NUM 2907 +#define BUILD_NUM 2908 diff --git a/doc/ChangeLog b/doc/ChangeLog index 4acb78278..153f7c547 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,11 @@ 2010-05-17 vadim + * PolicyCompiler_iosacl_writers.cpp (PrintRule::_printRule): + restored function of the "comment the code" in the "Script + options" of the firewall settings dialog for Cisco IOS ACL and + ProCurve ACL. When this checkbox is off, comments are not + added to generated script. + * RuleSetViewDelegate.cpp (RuleSetViewDelegate::paintOptions): fixed #1460 "when "show icons in rules" is turned off, there is no way to tell when logging is turned on and non-default options are diff --git a/src/cisco_lib/PolicyCompiler_iosacl_writers.cpp b/src/cisco_lib/PolicyCompiler_iosacl_writers.cpp index 4e96b12cf..b1d1c482b 100644 --- a/src/cisco_lib/PolicyCompiler_iosacl_writers.cpp +++ b/src/cisco_lib/PolicyCompiler_iosacl_writers.cpp @@ -215,17 +215,17 @@ string PolicyCompiler_iosacl::PrintRule::_printRule(PolicyRule *rule) { PolicyCompiler_iosacl *iosacl_comp = dynamic_cast(compiler); - //FWOptions *ruleopt =rule->getOptionsObject(); - //bool write_comments = compiler->fw->getOptionsObject()->getBool("iosacl_include_comments"); + string platform = compiler->fw->getStr("platform"); + FWOptions *ruleopt =rule->getOptionsObject(); + bool write_comments = compiler->fw->getOptionsObject()->getBool( + platform + "_include_comments"); ostringstream ruleout; ostringstream aclstr; - compiler->output << compiler->printComment( - rule, current_rule_label1, iosacl_comp->comment_symbol); - - // string err = rule->getStr(".error_msg"); - // if (!err.empty()) ruleout << "! " << err << endl; + if (write_comments) + compiler->output << compiler->printComment( + rule, current_rule_label1, iosacl_comp->comment_symbol); /* * all three rule elements contain exactly one object, which can diff --git a/test/procurve_acl/objects-for-regression-tests.fwb b/test/procurve_acl/objects-for-regression-tests.fwb index f79a6b5fe..858d24f5b 100644 --- a/test/procurve_acl/objects-for-regression-tests.fwb +++ b/test/procurve_acl/objects-for-regression-tests.fwb @@ -598,7 +598,7 @@ - + @@ -2591,7 +2591,7 @@ - + @@ -3179,16 +3179,17 @@ - + - + - + - + +