Add traffic shaping information to 'dump' output

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

Shorewall/changelog.txt

@@ -14,6 +14,8 @@ Changes in 3.0.3
 
 7) Allow "-" in the ADDRESS/SUBNET column of the blacklist file.
 
+8) Add traffic shaping information to "dump" output.
+
 Changes in 3.0.2
 
 1) Typos in the Samples corrected.

Shorewall/releasenotes.txt

@@ -61,6 +61,10 @@ New Features in 3.0.3
    /etc/shorewall/blacklist. That value is equivalent to specifying
    0.0.0.0/0 in that column.
 
+4) The output of "shorewall show tc" and "shorewall show classifiers" is
+   now included in the output from "shorewall dump". This will aid us in
+   analyzing traffic shaping problems.
+
 Problems Corrected in 3.0.2
 
 1) A couple of typos in the one-interface sample configuration have

Shorewall/shorewall

@@ -237,6 +237,12 @@ get_config() {
 	    ;;
     esac
 
+    case $TC_ENABLED in
+	[Nn][Oo])
+	    TC_ENABLED=
+	    ;;
+    esac
+
 }
 
 #
@@ -1032,6 +1038,16 @@ case "$1" in
 	determine_capabilities
 	echo
 	report_capabilities
+
+	if [ -n "$TC_ENABLED" ]; then
+	    echo
+	    echo "Traffic Control"
+	    echo
+	    show_tc
+	    echo "Traffic Filters"
+	    echo
+	    show_classifiers
+	fi
 	;;
     hits)
     	[ -n "$debugging" ] && set -x