Fix Makefile; rename status to dump and create a real status command

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

Shorewall/Makefile

@@ -3,7 +3,7 @@ VARDIR=/var/lib/shorewall
 CONFDIR=/etc/shorewall
 all: $(VARDIR)/restarted
 
-$(VARDIR)/restarted: $(CONFDIR)/*
+$(VARDIR)/restore-base: $(CONFDIR)/*
 	@/sbin/shorewall -q save >/dev/null; \
 	if \
 	    /sbin/shorewall -q restart >/dev/null 2>&1; \

Shorewall/changelog.txt

@@ -4,6 +4,10 @@ Changes in 2.5.1
 
 2) Remove dependence on 'which'
 
+3) Rename "status" to "dump" and add real status command.
+
+4) Fix Makefile (compare to restore-base rather than restarted).
+
 Changes in 2.5.1ex/2.5.0
 
 1) Clean up handling of zones

Shorewall/help

@@ -135,6 +135,18 @@ drop)
     See also \"help address\""
 	;;
 
+dump)
+	echo "dump: dump
+
+    shorewall [-x] dump
+
+    Produce a verbose report about the firewall for problem analysis.
+   
+    (iptables -L -n -)
+
+    When -x is given, that option is also passed to iptables to display actual packet and byte counts."
+	;;
+
 forget)
 	echo "forget: forget [ <file name> ]
     Deletes /var/lib/shorewall/<file name>. If no <file name> is given then
@@ -288,13 +300,11 @@ stop)
 status)
 	echo "status: status
 
-    shorewall [-x] status
+    shorewall status
 
-    Produce a verbose report about the firewall.
-   
-    (iptables -L -n -)
-
-    When -x is given, that option is also passed to iptables to display actual packet and byte counts."
+    Displays the Shorewall status (started/not-started). If Shorewall is started,
+    the time at which Shorewall was last started/restarted/refreshed or reset is
+    displayed.   
 	;;
 
 trace)

Shorewall/releasenotes.txt

@@ -7,6 +7,12 @@ Problems Corrected in 2.5.1:
 2) "shorewall add" no longer fails when the 'ipsec' option has appeared
    in /etc/shorewall/hosts.
 
+3) The Makefile has been changed to compare the modification times of
+   the files in /etc/shorewall with
+   /var/lib/shorewall/restore-base. That file is modified each time
+   that Shorewall is [re]started whereas /var/lib/shorewall/restarted
+   is also modified by "shorewall reset" and "shorewall refresh".
+
 Problems Corrected in 2.5.0:
 
 1) The behavior of CONTINUE policies has been improved. Shorewall no
@@ -137,6 +143,10 @@ Migration Considerations:
    from that directory to /var/lib/shorewall/ before [re]starting
    Shorewall after the upgrade to this version.
 
+7) The "shorewall status" command now just gives the status of
+   Shorewall (started or not-started). The previous status command has
+   been renamed "dump".
+
 New Features in Shorewall 2.5.0
 
 1) Error and warning messages are made easier to spot by using

Shorewall/shorewall

@@ -33,6 +33,8 @@
 #
 #          shorewall add <iface>[:<host>] zone     Adds a host or subnet to a zone
 #          shorewall delete <iface>[:<host>] zone  Deletes a host or subnet from a zone
+#          shorewall dump                          Dumps all Shorewall-related information
+#                                                  for problem analysis
 #	   shorewall start 			   Starts the firewall
 #	   shorewall restart			   Restarts the firewall
 #	   shorewall stop			   Stops the firewall
@@ -495,6 +497,7 @@ usage() # $1 = exit status
     echo "   clear"
     echo "   delete <interface>[:{<bridge-port>[:<host>]|<host>}[,...]] ... <zone>"
     echo "   drop <address> ..."
+    echo "   dump"
     echo "   forget [ <file name> ]"
     echo "   help [ <command > | host | address ]"
     echo "   hits"
@@ -905,10 +908,22 @@ case "$1" in
 	esac
 	;;
     status)
+	[ $# -eq 1 ] || usage 1
+	echo "Shorewall-$version Status at $HOSTNAME - $(date)"
+	echo
+	if qt $IPTABLES -L shorewall -n -v; then
+	    echo "Shorewall is started"
+	    echo 
+	    show_reset
+	else
+	    echo "Shorewall is not started"
+	fi
+	;;
+    dump)
     	[ -n "$debugging" ] && set -x
 	[ $# -eq 1 ] || usage 1
 	clear_term
-	echo "Shorewall-$version Status at $HOSTNAME - $(date)"
+	echo "Shorewall-$version Dump at $HOSTNAME - $(date)"
 	echo
 	show_reset
 	host=$(echo $HOSTNAME | sed 's/\..*$//')