From 5bae689fe1fb8cde8214fef0721abb133f14671e Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sun, 14 Nov 2010 07:38:01 -0800 Subject: [PATCH] Generate distinct progress messages for IPv4 and IPv6 filters --- Shorewall/Perl/Shorewall/Tc.pm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Tc.pm b/Shorewall/Perl/Shorewall/Tc.pm index 47780b245..7fdb3f767 100644 --- a/Shorewall/Perl/Shorewall/Tc.pm +++ b/Shorewall/Perl/Shorewall/Tc.pm @@ -1164,11 +1164,20 @@ sub process_tc_filter() { emit ''; - progress_message " TC Filter \"$currentline\" $done"; + if ( $family == F_IPV4 ) { - $currentline =~ s/\s+/ /g; + progress_message " IPv4 TC Filter \"$currentline\" $done"; - save_progress_message_short qq(' TC Filter \"$currentline\" defined.'); + $currentline =~ s/\s+/ /g; + + save_progress_message_short qq(' IPv4 TC Filter \"$currentline\" defined.'); + } else { + progress_message " IPv6 TC Filter \"$currentline\" $done"; + + $currentline =~ s/\s+/ /g; + + save_progress_message_short qq(' IPv6 TC Filter \"$currentline\" defined.'); + } emit '';