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

Fix indentation and quoting in TC progress messages

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-03-19 06:59:58 -07:00
parent f44dbcf20b
commit a71f5df64f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -487,7 +487,7 @@ sub process_simple_device() {
emit ''; emit '';
} }
save_progress_message_short " TC Device $physical defined."; save_progress_message_short qq(" TC Device $physical defined.");
pop_indent; pop_indent;
emit 'else'; emit 'else';
@ -1062,7 +1062,7 @@ sub process_tc_filter( ) {
$currentline =~ s/\s+/ /g; $currentline =~ s/\s+/ /g;
save_progress_message_short qq(" TC Filter \"$currentline\" defined."); save_progress_message_short qq(' TC Filter \"$currentline\" defined.');
emit ''; emit '';
@ -1125,7 +1125,7 @@ sub process_tc_priority() {
sub setup_simple_traffic_shaping() { sub setup_simple_traffic_shaping() {
my $interfaces; my $interfaces;
save_progress_message "Setting up Traffic Control..."; save_progress_message q("Setting up Traffic Control...");
my $fn = open_file 'tcinterfaces'; my $fn = open_file 'tcinterfaces';
@ -1159,7 +1159,7 @@ sub setup_simple_traffic_shaping() {
sub setup_traffic_shaping() { sub setup_traffic_shaping() {
our $lastrule = ''; our $lastrule = '';
save_progress_message "Setting up Traffic Control..."; save_progress_message q("Setting up Traffic Control...");
my $fn = open_file 'tcdevices'; my $fn = open_file 'tcdevices';
@ -1241,7 +1241,7 @@ sub setup_traffic_shaping() {
emit( "run_tc filter add dev $rdev parent ffff: protocol all u32 match u32 0 0 action mirred egress redirect dev $device > /dev/null" ); emit( "run_tc filter add dev $rdev parent ffff: protocol all u32 match u32 0 0 action mirred egress redirect dev $device > /dev/null" );
} }
save_progress_message_short " TC Device $device defined."; save_progress_message_short qq(" TC Device $device defined.");
pop_indent; pop_indent;
emit 'else'; emit 'else';
@ -1343,7 +1343,7 @@ sub setup_traffic_shaping() {
$fn = open_file 'tcfilters'; $fn = open_file 'tcfilters';
if ( $fn ) { if ( $fn ) {
first_entry( sub { progress_message2 "$doing $fn..."; save_progress_message "Adding TC Filters"; } ); first_entry( sub { progress_message2 "$doing $fn..."; save_progress_message q("Adding TC Filters"); } );
process_tc_filter while read_a_line; process_tc_filter while read_a_line;
} }
@ -1390,7 +1390,7 @@ sub setup_tc() {
} }
if ( $globals{TC_SCRIPT} ) { if ( $globals{TC_SCRIPT} ) {
save_progress_message 'Setting up Traffic Control...'; save_progress_message q('Setting up Traffic Control...');
append_file $globals{TC_SCRIPT}; append_file $globals{TC_SCRIPT};
} elsif ( $config{TC_ENABLED} eq 'Internal' ) { } elsif ( $config{TC_ENABLED} eq 'Internal' ) {
setup_traffic_shaping; setup_traffic_shaping;