holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Don't print phoney progress message

Browse Source 
- The 'Setting up Traffic Shaping' progress message was being issued when
  traffic shaping was not enabled.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-07-01 08:27:07 -07:00
parent 6ddaa0190e
commit 09c00cf425
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Shorewall/Perl/Shorewall/Tc.pm
View File

@ -2031,13 +2031,15 @@ sub process_tc() {
# Call the setup_${dev}_tc functions # Call the setup_${dev}_tc functions
# #
sub setup_traffic_shaping() { sub setup_traffic_shaping() {
save_progress_message q("Setting up Traffic Control..."); if ( @tcdevices ) {
save_progress_message q("Setting up Traffic Control...");
for my $device ( @tcdevices ) { for my $device ( @tcdevices ) {
my $interfaceref = known_interface( $device ); my $interfaceref = known_interface( $device );
my $dev = chain_base( $interfaceref ? $interfaceref->{physical} : $device ); my $dev = chain_base( $interfaceref ? $interfaceref->{physical} : $device );
emit "setup_${dev}_tc"; emit "setup_${dev}_tc";
}
} }
} }
@ -2157,7 +2159,7 @@ sub setup_tc() {
append_file $globals{TC_SCRIPT}; append_file $globals{TC_SCRIPT};
} else { } else {
process_tcpri if $config{TC_ENABLED} eq 'Simple'; process_tcpri if $config{TC_ENABLED} eq 'Simple';
setup_traffic_shaping unless $config{TC_ENABLED} eq 'Shared'; setup_traffic_shaping if @tcdevices && $config{TC_ENABLED} ne 'Shared';
} }
if ( $config{TC_ENABLED} ) { if ( $config{TC_ENABLED} ) {