Remote release documents from Shorewall Lite; implement 'show routing' and 'show ip' commands

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4721 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb

Shorewall-lite/changelog.txt

@@ -1,21 +0,0 @@
-Changes in 3.3.3
-
-1)  Add logfile name to output of "shorewall show log" and "shorewall
-    logwatch".
-
-Changes in 3.3.1
-
-1)  Update Versions.
-
-Changes in 3.3.0
-
-1)  Fix output of 'hits' command under busybox 1.2.0.
-
-2)  Fixed output of 'hits' with spaces as delimiters in /etc/services.
-
-3)  Fixed modules/xmodules snafu.
-
-4)  Fix comments in shorewall-lite.
-
-5)  Merge shorewall.conf handling changes.
-

Shorewall-lite/help

@@ -205,7 +205,7 @@ save)
 	;;
 
 show)
-	echo "show: show [ <chain> [ <chain> ...] |actions|capabilities|classifiers|config|connections|log|macros|mangle|nat|tc|zones]
+	echo "show: show [ <chain> [ <chain> ...] |actions|capabilities|classifiers|config|connections|ip|log|macros|mangle|nat|routing|tc|zones]
 
     shorewall-lite [-x] show <chain> [ <chain> ... ]  - produce a verbose report about the IPtable chain(s).
     (iptables -L chain -n -v)
@@ -231,6 +231,10 @@ show)
     specified, then the output is suitable for use as /etc/shorewall/capabilities on your administrative
     system.
 
+    shorewall-lite show ip - produces output equivalent to 'ip addr ls'
+
+    shorewall-lite show routing - produces a report about routing rules and tables.
+
     shorewall-lite show config - displays the default CONFIG_PATH and LITEDIR for your distribution
 
     When -x is given, that option is also passed to iptables to display actual packet and byte counts."

Shorewall-lite/releasenotes.txt

@@ -1,14 +0,0 @@
-Shorewall Lite 3.3.3
-
-Problems Corrected in 3.3.3
-
-None.
-
-Other changes in 3.3.3
-
-1)  The output of "shorewall show log" and "shorewall logwatch" now
-    include the name of the log file being accessed. 
-
-
-
-

Shorewall-lite/shorewall-lite

@@ -670,6 +670,25 @@ restart_command() {
     return $rc
 }
 
+#
+# Show routing configuration
+#
+show_routing() {
+    if [ -n "$(ip rule ls)" ]; then
+	heading "Routing Rules"
+	ip rule ls
+	ip rule ls | while read rule; do
+	    echo ${rule##* }
+	done | sort -u | while read table; do
+	    heading "Table $table:"
+	    ip route ls table $table
+	done
+    else
+	heading "Routing Table"
+	ip route ls
+    fi
+}
+
 #
 # Show Command Executor
 #
@@ -798,6 +817,18 @@ show_command() {
 	    echo "Default CONFIG_PATH is $CONFIG_PATH"
 	    echo "LITEDIR is $LITEDIR"
 	    ;;
+	ip)
+	    [ $# -gt 1 ] && usage 1
+	    echo "Shorewall Lite $version IP at $HOSTNAME - $(date)"
+	    echo
+	    ip addr ls
+	    ;;
+	routing)
+	    [ $# -gt 1 ] && usage 1
+	    echo "Shorewall Lite $version Routing at $HOSTNAME - $(date)"
+	    echo
+	    show_routing
+	    ;;
 	*)
 	    echo "Shorewall Lite $version $([ $# -gt 0 ] && echo Chains || echo Chain) $* at $HOSTNAME - $(date)"
 	    echo
@@ -892,19 +923,7 @@ dump_command() {
 	done
     done
 
-    if [ -n "$(ip rule ls)" ]; then
+    show_routing
-	heading "Routing Rules"
-	ip rule ls
-	ip rule ls | while read rule; do
-	    echo ${rule##* }
-	done | sort -u | while read table; do
-	    heading "Table $table:"
-	    ip route ls table $table
-	done
-    else
-	heading "Routing Table"
-	ip route ls
-    fi
 
     heading "ARP"
     arp -na
@@ -1030,7 +1049,7 @@ usage() # $1 = exit status
     echo "   restart [ -n ] [ <directory> ]"
     echo "   restore [ -n ] [ <file name> ]"
     echo "   save [ <file name> ]"
-    echo "   show [ -x ] [ -m ] [ -f ] [<chain> [ <chain> ... ]|capabilities|classifiers|config|connections|log|mangle|nat|tc|zones]"
+    echo "   show [ -x ] [ -m ] [ -f ] [<chain> [ <chain> ... ]|capabilities|classifiers|config|connections|ip|log|mangle|nat|routing|tc|zones]"
     echo "   start [ -f ] [ -n ] [ <directory> ]"
     echo "   stop"
     echo "   status"

Shorewall/changelog.txt

@@ -2,6 +2,8 @@ Changes in 3.3.4
 
 1)  Make exclusion work with "show zones"
 
+2)  Add 'show ip' and 'show routing' commands.
+
 Changes in 3.3.3
 
 1)  Fix excluding in SUBNET column.

Shorewall/help

@@ -348,7 +348,7 @@ save)
 	;;
 
 show)
-	echo "show: show [ <chain> [ <chain> ...] |actions|capabilities|classifiers|config|connections|log|macros|mangle|nat|tc|zones]
+	echo "show: show [ <chain> [ <chain> ...] |actions|capabilities|classifiers|config|connections|ip|log|macros|mangle|nat|routing|tc|zones]
 
     shorewall [-x] show <chain> [ <chain> ... ]  - produce a verbose report about the IPtable chain(s).
     (iptables -L chain -n -v)
@@ -377,6 +377,10 @@ show)
     shorewall show [ -f ] capabilities - displays your kernel/iptables capabilities. When \"-f\" is
     specified, then the output is suitable for use as /etc/shorewall/capabilities.
 
+    shorewall show ip - produces output equivalent to 'ip addr ls'
+
+    shorewall show routing - produces a report about routing rules and tables.
+
     shorewall show config - displays the default CONFIG_PATH and LITEDIR for your distribution
 
     When -x is given, that option is also passed to iptables to display actual packet and byte counts."

Shorewall/releasenotes.txt

@@ -37,7 +37,10 @@ None.
 
 Other Changes in 3.3.4.
 
-None.
+1)  New "shorewall[-lite] show ip" and "shorewall[-lite] show routing"
+    commands have been added. The first produces the same output as "ip
+    addr ls". The second produces a report about your routing rules and
+    tables.
 
 Migration Considerations:
 

Shorewall/shorewall

@@ -917,6 +917,25 @@ refresh_command() {
     [ -n "$nolock" ] || mutex_off
 }
 
+#
+# Show routing configuration
+#
+show_routing() {
+    if [ -n "$(ip rule ls)" ]; then
+	heading "Routing Rules"
+	ip rule ls
+	ip rule ls | while read rule; do
+	    echo ${rule##* }
+	done | sort -u | while read table; do
+	    heading "Table $table:"
+	    ip route ls table $table
+	done
+    else
+	heading "Routing Table"
+	ip route ls
+    fi
+}
+
 #
 # Show Command Executor
 #
@@ -1064,6 +1083,18 @@ show_command() {
 		fi
 	    done
 	    ;;
+	ip)
+	    [ $# -gt 1 ] && usage 1
+	    echo "Shorewall Lite $version IP at $HOSTNAME - $(date)"
+	    echo
+	    ip addr ls
+	    ;;
+	routing)
+	    [ $# -gt 1 ] && usage 1
+	    echo "Shorewall Lite $version Routing at $HOSTNAME - $(date)"
+	    echo
+	    show_routing
+	    ;;
 	config)
 	    . ${SHAREDIR}/configpath
 	    echo "Default CONFIG_PATH is $CONFIG_PATH"
@@ -1163,19 +1194,7 @@ dump_command() {
 	done
     done
 
-    if [ -n "$(ip rule ls)" ]; then
+    show_routing
-	heading "Routing Rules"
-	ip rule ls
-	ip rule ls | while read rule; do
-	    echo ${rule##* }
-	done | sort -u | while read table; do
-	    heading "Table $table:"
-	    ip route ls table $table
-	done
-    else
-	heading "Routing Table"
-	ip route ls
-    fi
 
     heading "ARP"
     arp -na
@@ -1567,7 +1586,7 @@ usage() # $1 = exit status
     echo "   restart [ -n ] [ <directory> ]"
     echo "   restore [ -n ] [ <file name> ]"
     echo "   save [ <file name> ]"
-    echo "   show [ -x ] [ -m ] [-f] [<chain> [ <chain> ... ]|actions|capabilities|classifiers|config|connections|log|macros|mangle|nat|tc|zones]"
+    echo "   show [ -x ] [ -m ] [-f] [<chain> [ <chain> ... ]|actions|capabilities|classifiers|config|connections|ip|log|macros|mangle|nat|routing|tc|zones]"
     echo "   start [ -f ] [ -n ] [ <directory> ]"
     echo "   stop"
     echo "   status"