Implement an '-l' option to the 'show' command

Shorewall/changelog.txt

@@ -18,7 +18,10 @@ Changes in Shorewall 4.4.4
 
 9)  Fix route_rule suppression for down provider.
 
-10) Suppress redundant tests for provider availability in route rules processing.
+10) Suppress redundant tests for provider availability in route rules
+    processing.
+
+11) Implement the '-l' option to the 'show' command.
 
 Changes in Shorewall 4.4.3
 

Shorewall/lib.cli

@@ -430,6 +430,10 @@ show_command() {
 			    option=
 			    shift
 			    ;;
+			l*)
+			    IPT_OPTIONS1="--line-numbers"
+			    option=${option#l}
+			    ;;
 			*)
 			    usage 1
 			    ;;
@@ -443,6 +447,8 @@ show_command() {
 	esac
     done
 
+    IPT_OPTIONS="$IPT_OPTIONS $IPT_OPTIONS1"
+
     [ -n "$debugging" ] && set -x
     case "$1" in
 	connections)
@@ -679,6 +685,10 @@ dump_command() {
 			    SHOWMACS=Yes
 			    option=${option#m}
 			    ;;
+			l*)
+			    IPT_OPTIONS1="--line-numbers"
+			    option=${option#l}
+			    ;;
 			*)
 			    usage 1
 			    ;;
@@ -692,6 +702,8 @@ dump_command() {
 	esac
     done
 
+    IPT_OPTIONS="$IPT_OPTIONS $IPT_OPTIONS1"
+
     [ $VERBOSE -lt 2 ] && VERBOSE=2
 
     [ -n "$debugging" ] && set -x

Shorewall/releasenotes.txt

@@ -296,6 +296,11 @@ None.
     zones associated with a single network where that network
     doesn't specify 'routeback'.
 
+7)  The 'show' and 'dump' commands now support an '-l' option which
+    causes chain displays to include the rule number of each rule.
+
+    (Type 'iptables -h' and look for '--line-number')
+
 ----------------------------------------------------------------------------
                 N E W   F E A T U R E S   I N   4 . 4 . 0
 ----------------------------------------------------------------------------

Shorewall6/lib.cli

@@ -383,6 +383,10 @@ show_command() {
 			    option=
 			    shift
 			    ;;
+			l*)
+			    IPT_OPTIONS1="--line-numbers"
+			    option=${option#l}
+			    ;;
 			*)
 			    usage 1
 			    ;;
@@ -396,6 +400,8 @@ show_command() {
 	esac
     done
 
+    IPT_OPTIONS="$IPT_OPTIONS $IPT_OPTIONS1"
+
     [ -n "$debugging" ] && set -x
     case "$1" in
 	connections)
@@ -602,6 +608,10 @@ dump_command() {
 			    SHOWMACS=Yes
 			    option=${option#m}
 			    ;;
+			l*)
+			    IPT_OPTIONS1="--line-numbers"
+			    option=${option#l}
+			    ;;
 			*)
 			    usage 1
 			    ;;
@@ -615,6 +625,8 @@ dump_command() {
 	esac
     done
 
+    IPT_OPTIONS="$IPT_OPTIONS $IPT_OPTIONS1"
+
     [ $VERBOSE -lt 2 ] && VERBOSE=2
 
     [ -n "$debugging" ] && set -x

manpages/shorewall.xml

@@ -135,6 +135,8 @@
 
       <arg><option>-x</option></arg>
 
+      <arg><option>-l</option></arg>
+
       <arg><option>-m</option></arg>
     </cmdsynopsis>
 
@@ -450,6 +452,8 @@
 
       <arg><option>-x</option></arg>
 
+      <arg><option>-l</option></arg>
+
       <arg><option>-t</option>
       {<option>filter</option>|<option>mangle</option>|<option>nat</option>|<option>raw</option>}</arg>
 
@@ -794,6 +798,9 @@
           counts are abbreviated. The <emphasis role="bold">-m</emphasis>
           option causes any MAC addresses included in Shorewall log messages
           to be displayed.</para>
+
+          <para>The <emphasis role="bold">-l</emphasis> option causes the rule
+          number for each Netfilter rule to be displayed.</para>
         </listitem>
       </varlistentry>
 
@@ -1201,6 +1208,10 @@
                 Netfilter table to display. The default is <emphasis
                 role="bold">filter</emphasis>.</para>
 
+                <para>The <emphasis role="bold">-l</emphasis> option causes
+                the rule number for each Netfilter rule to be
+                displayed.</para>
+
                 <para>If the <emphasis role="bold">t</emphasis> option and the
                 <option>chain</option> keyword are both omitted and any of the
                 listed <replaceable>chain</replaceable>s do not exist, a usage

manpages6/shorewall6.xml

@@ -100,6 +100,8 @@
 
       <arg><option>-x</option></arg>
 
+      <arg><option>-l</option></arg>
+
       <arg><option>-m</option></arg>
     </cmdsynopsis>
 
@@ -367,6 +369,8 @@
 
       <arg><option>-x</option></arg>
 
+      <arg><option>-l</option></arg>
+
       <arg><option>-t</option>
       {<option>filter</option>|<option>mangle</option>|<option>raw</option>}</arg>
 
@@ -650,6 +654,9 @@
           counts are abbreviated. The <emphasis role="bold">-m</emphasis>
           option causes any MAC addresses included in Shorewall6 log messages
           to be displayed.</para>
+
+          <para>The <emphasis role="bold">-l</emphasis> option causes the rule
+          number for each Netfilter rule to be displayed.</para>
         </listitem>
       </varlistentry>
 
@@ -1022,10 +1029,14 @@
                 Netfilter table to display. The default is <emphasis
                 role="bold">filter</emphasis>.</para>
 
-                <para>If the <emphasis role="bold">t</emphasis> option and the
+                <para>The <emphasis role="bold">-l</emphasis> option causes
-                <option>chain</option> keyword are both omitted and any of the
+                the rule number for each Netfilter rule to be
-                listed <replaceable>chain</replaceable>s do not exist, a usage
+                displayed.</para>
-                message is displayed.</para>
+
+                <para>If the <emphasis role="bold">-t</emphasis> option and
+                the <option>chain</option> keyword are both omitted and any of
+                the listed <replaceable>chain</replaceable>s do not exist, a
+                usage message is displayed.</para>
               </listitem>
             </varlistentry>