2009-06-11 vadim <vadim@vk.crocodile.org>

* 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

@@ -1 +1 @@
-#define BUILD_NUM 1049
+#define BUILD_NUM 1050

doc/ChangeLog

@@ -1,3 +1,11 @@
+2009-06-11  vadim  <vadim@vk.crocodile.org>
+
+	* 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  <vadim@vk.crocodile.org>
 
 	* NATCompiler_pf_writers.cpp (PrintRule::_printSrcPort): fixed bug

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" );
 

src/gui/iosacladvanceddialog_q.ui

@@ -22,7 +22,7 @@
    <item row="0" column="0" >
     <widget class="QTabWidget" name="tabWidget" >
      <property name="currentIndex" >
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="compiler_tab" >
       <attribute name="title" >
@@ -228,10 +228,7 @@ workstation with this address:</string>
          <property name="title" >
           <string/>
          </property>
-         <layout class="QGridLayout" >
+         <layout class="QGridLayout" name="gridLayout_7" >
-          <property name="margin" >
-           <number>6</number>
-          </property>
           <item row="0" column="0" >
            <widget class="QCheckBox" name="iosacl_include_comments" >
             <property name="toolTip" >
@@ -242,6 +239,16 @@ workstation with this address:</string>
             </property>
            </widget>
           </item>
+          <item row="1" column="0" >
+           <widget class="QCheckBox" name="iosacl_use_acl_remarks" >
+            <property name="toolTip" >
+             <string>Insert comments into generated IOSACL configuration file</string>
+            </property>
+            <property name="text" >
+             <string>Use ACL remarks</string>
+            </property>
+           </widget>
+          </item>
           <item row="2" column="0" >
            <widget class="QCheckBox" name="iosacl_regroup_commands" >
             <property name="toolTip" >

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();

test/iosacl/objects-for-regression-tests.fwb

@@ -1556,7 +1556,7 @@
           <Option name="verify_interfaces">true</Option>
         </FirewallOptions>
       </Firewall>
-      <Firewall id="id464359FE16989" host_OS="ios" inactive="False" lastCompiled="1230880328" lastInstalled="0" lastModified="1236918502" platform="iosacl" version="12.x" name="c3620" comment="" ro="False">
+      <Firewall id="id464359FE16989" host_OS="ios" inactive="False" lastCompiled="1244751217" lastInstalled="0" lastModified="1244750432" platform="iosacl" version="12.x" name="c3620" comment="" ro="False">
         <NAT id="id46435A0216989" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True"/>
         <Policy id="id46435A0116989" name="Policy" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <PolicyRule id="id464D2B0E24319" disabled="False" log="False" position="0" action="Accept" direction="Inbound" comment="interface eth 1/1 has only&#10;inbound access list">
@@ -1855,7 +1855,7 @@
         <Interface id="id46435A0C16989" bridgeport="False" dyn="False" label="" mgmt="False" security_level="100" unnum="False" unprotected="True" name="Serial1/0" comment="" ro="False">
           <IPv4 id="id46435A0D16989" name="c3620:Serial1/0:ip" comment="" ro="False" address="0.0.0.0" netmask="255.255.255.255"/>
         </Interface>
-        <Management address="192.168.171.2">
+        <Management address="10.3.14.201">
           <SNMPManagement enabled="False" snmp_read_community="" snmp_write_community=""/>
           <FWBDManagement enabled="False" identity="" port="-1"/>
           <PolicyInstallScript arguments="" command="" enabled="False"/>
@@ -1884,15 +1884,16 @@
           <Option name="iosacl_generate_logging_commands">True</Option>
           <Option name="iosacl_include_comments">True</Option>
           <Option name="iosacl_logging_buffered">True</Option>
-          <Option name="iosacl_logging_buffered_level">4</Option>
+          <Option name="iosacl_logging_buffered_level">5</Option>
           <Option name="iosacl_logging_console">True</Option>
-          <Option name="iosacl_logging_console_level">4</Option>
+          <Option name="iosacl_logging_console_level">5</Option>
           <Option name="iosacl_logging_timestamp">False</Option>
-          <Option name="iosacl_logging_trap_level">1</Option>
+          <Option name="iosacl_logging_trap_level">2</Option>
           <Option name="iosacl_prolog_script"></Option>
           <Option name="iosacl_regroup_commands">False</Option>
           <Option name="iosacl_syslog_facility"></Option>
           <Option name="iosacl_syslog_host"></Option>
+          <Option name="iosacl_use_acl_remarks">True</Option>
           <Option name="ipv4_6_order">ipv4_first</Option>
           <Option name="limit_value">0</Option>
           <Option name="linux24_ip_forward">1</Option>
@@ -1927,6 +1928,7 @@
           <Option name="pix_use_acl_remarks">true</Option>
           <Option name="prompt1">$ </Option>
           <Option name="prompt2"> # </Option>
+          <Option name="scpArgs"></Option>
           <Option name="solaris_ip_forward">1</Option>
           <Option name="sshArgs"></Option>
           <Option name="ulog_nlgroup">1</Option>