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

Fix TC_ENABLED=Shared

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-09-16 06:50:34 -07:00
parent 551f93762d
commit 76fc55d750
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1456,18 +1456,18 @@ sub process_traffic_shaping() {
$device = physical_name $device; $device = physical_name $device;
my $dev = chain_base( $device );
emit( '',
'#',
"# Configure Traffic Shaping for $device",
'#',
"setup_${dev}_tc() {" );
push_indent;
unless ( $config{TC_ENABLED} eq 'Shared' ) { unless ( $config{TC_ENABLED} eq 'Shared' ) {
my $dev = chain_base( $device );
emit( '',
'#',
"# Configure Traffic Shaping for $device",
'#',
"setup_${dev}_tc() {" );
push_indent;
emit "if interface_is_up $device; then"; emit "if interface_is_up $device; then";
push_indent; push_indent;
@ -1589,25 +1589,25 @@ sub process_traffic_shaping() {
emit ''; emit '';
} }
emit '';
emit "$_" for @{$devref->{filters}};
save_progress_message_short qq(" TC Device $device defined.");
pop_indent;
emit 'else';
push_indent;
emit qq(error_message "WARNING: Device $device is not in the UP state -- traffic-shaping configuration skipped");
emit "${dev}_exists=";
pop_indent;
emit "fi\n";
pop_indent;
emit "}\n";
} }
emit '';
emit "$_" for @{$devref->{filters}};
save_progress_message_short qq(" TC Device $device defined.");
pop_indent;
emit 'else';
push_indent;
emit qq(error_message "WARNING: Device $device is not in the UP state -- traffic-shaping configuration skipped");
emit "${dev}_exists=";
pop_indent;
emit "fi\n";
pop_indent;
emit "}\n";
} }
} }
@ -1625,7 +1625,9 @@ sub process_tc() {
# it can call the appropriate 'setup_x_tc" function when the device is # it can call the appropriate 'setup_x_tc" function when the device is
# enabled. # enabled.
\%tcdevices; my %empty;
$config{TC_ENABLED} eq 'Shared' ? \%empty : \%tcdevices;
} }
# #
@ -1640,7 +1642,6 @@ sub setup_traffic_shaping() {
emit "setup_${dev}_tc"; emit "setup_${dev}_tc";
} }
} }
# #
@ -1756,7 +1757,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; setup_traffic_shaping unless $config{TC_ENABLED} eq 'Shared';
} }
if ( $config{TC_ENABLED} ) { if ( $config{TC_ENABLED} ) {