From 1e90a52b3171cce6eb7b73ae3194203bdc631521 Mon Sep 17 00:00:00 2001 From: Tom Eastep <teastep@shorewall.net> Date: Sat, 29 Aug 2020 12:38:53 -0700 Subject: [PATCH] Deprecate 'show filters/classifiers' Signed-off-by: Tom Eastep <teastep@shorewall.net> --- Shorewall-core/lib.cli | 5 +++-- Shorewall-core/manpages/shorewall.xml | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Shorewall-core/lib.cli b/Shorewall-core/lib.cli index 39483854f..a19bc3038 100644 --- a/Shorewall-core/lib.cli +++ b/Shorewall-core/lib.cli @@ -1026,6 +1026,8 @@ show_mangle() { show_classifiers_command() { echo "$g_product $SHOREWALL_VERSION Classifiers at $g_hostname - $(date)" echo + echo "Warning: This command is deprecated in favor of the 'show tc' command" + echo show_classifiers } @@ -4446,12 +4448,11 @@ usage() # $1 = exit status echo " [ show | list | ls ] arptables" echo " [ show | list | ls ] [ -f ] capabilities" echo " [ show | list | ls ] [ -x ] {bl|blacklists}" - echo " [ show | list | ls ] classifiers" + echo " [ show | list | ls ] {classifiers|filters)" echo " [ show | list | ls ] config" echo " [ show | list | ls ] connections" echo " [ show | list | ls ] event [ <event> ...]" echo " [ show | list | ls ] events" - echo " [ show | list | ls ] filters" echo " [ show | list | ls ] ip" if [ $g_family -eq 4 ]; then diff --git a/Shorewall-core/manpages/shorewall.xml b/Shorewall-core/manpages/shorewall.xml index 6a24f7acf..e2340727d 100644 --- a/Shorewall-core/manpages/shorewall.xml +++ b/Shorewall-core/manpages/shorewall.xml @@ -2527,7 +2527,9 @@ <listitem> <para>Displays information about the packet classifiers defined on the system as a result of traffic shaping - configuration.</para> + configuration. Beginning with Shorewall 5.2.8, this command is + deprecated, as its output is included in the information + displayed by the 'show tc' command.</para> </listitem> </varlistentry>