diff --git a/Shorewall-core/lib.cli b/Shorewall-core/lib.cli index 2898ea62f..c0f5146c5 100644 --- a/Shorewall-core/lib.cli +++ b/Shorewall-core/lib.cli @@ -3563,14 +3563,21 @@ blacklist_command() { if [ -n "$g_disconnect" ]; then message="$(conntrack -D -s $1 2>&1)" if [ -n "$message" -a $VERBOSITY -gt 0 ]; then - echo "$message" | sed 's/^.*: //; s/ / dst /' - echo "$message" | awk '/have been deleted/ { sub( /^.*: /, "" ); sub( / /, " src " ); }; { print; }' + if [ $VERBOSITY -gt 1 ]; then + echo "$message" | awk '/have been deleted/ { sub( /^.*: /, "" ); sub( / /, " src " ); }; { print; }' + else + echo "$message" | head -n1 | sed '/^.*: //; s/ / src /' + fi fi if [ $g_disconnect = src-dst ]; then message="$(conntrack -D -d $1 2>&1)" if [ -n "$message" -a $VERBOSITY -gt 0 ]; then - echo "$message" | awk '/have been deleted/ { sub( /^.*: /, "" ); sub( / /, " dst " ); }; { print; }' + if [ $VERBOSITY -gt 1 ]; then + echo "$message" | awk '/have been deleted/ { sub( /^.*: /, "" ); sub( / /, " dst " ); }; { print; }' + else + echo "$message" | head -n1 | sed '/^.*: //; s/ / dst /' + fi fi fi fi diff --git a/Shorewall-lite/manpages/shorewall-lite.xml b/Shorewall-lite/manpages/shorewall-lite.xml index e090f022b..9ee27f58d 100644 --- a/Shorewall-lite/manpages/shorewall-lite.xml +++ b/Shorewall-lite/manpages/shorewall-lite.xml @@ -724,6 +724,23 @@ address along with any options are passed to the ipset add command. + + If the option is specified in the + DYNAMIC_BLACKLISTING setting, then the effective VERBOSITY + determines the amount of information displayed: + + + + If the effective verbosity is > 0, then a message + giving the number of conntrack flows deleted by the command is + displayed. + + + + If the effective verbosity is > 1, then the conntrack + table entries deleted by the command are also displayed. + + diff --git a/Shorewall/manpages/shorewall.xml b/Shorewall/manpages/shorewall.xml index 63ebde02c..60f6c5ef8 100644 --- a/Shorewall/manpages/shorewall.xml +++ b/Shorewall/manpages/shorewall.xml @@ -988,6 +988,23 @@ address along with any options are passed to the ipset add command. + + If the option is specified in the + DYNAMIC_BLACKLISTING setting, then the effective VERBOSITY + determines the amount of information displayed: + + + + If the effective verbosity is > 0, then a message + giving the number of conntrack flows deleted by the command is + displayed. + + + + If the effective verbosity is > 1, then the conntrack + table entries deleted by the command are also displayed. + + diff --git a/Shorewall6-lite/manpages/shorewall6-lite.xml b/Shorewall6-lite/manpages/shorewall6-lite.xml index 6151226a5..c44b5bd92 100644 --- a/Shorewall6-lite/manpages/shorewall6-lite.xml +++ b/Shorewall6-lite/manpages/shorewall6-lite.xml @@ -701,6 +701,23 @@ The address along with any options are passed to the ipset add command. + + If the option is specified in the + DYNAMIC_BLACKLISTING setting, then the effective VERBOSITY + determines the amount of information displayed: + + + + If the effective verbosity is > 0, then a message + giving the number of conntrack flows deleted by the command is + displayed. + + + + If the effective verbosity is > 1, then the conntrack + table entries deleted by the command are also displayed. + + diff --git a/Shorewall6/manpages/shorewall6.xml b/Shorewall6/manpages/shorewall6.xml index 5caf370f3..0ff34dbb7 100644 --- a/Shorewall6/manpages/shorewall6.xml +++ b/Shorewall6/manpages/shorewall6.xml @@ -954,6 +954,23 @@ The address along with any options are passed to the ipset add command. + + If the option is specified in the + DYNAMIC_BLACKLISTING setting, then the effective VERBOSITY + determines the amount of information displayed: + + + + If the effective verbosity is > 0, then a message + giving the number of conntrack flows deleted by the command is + displayed. + + + + If the effective verbosity is > 1, then the conntrack + table entries deleted by the command are also displayed. + +