extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-01-20 12:39:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix $convert/$tcrules mess

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>

Conflicts:
	Shorewall/Perl/Shorewall/Tc.pm
This commit is contained in:
Tom Eastep 2015-08-31 11:19:42 -07:00
parent c77d18965a
commit 9b886a99af
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,7 +135,7 @@ our %restrictions = ( tcpre => PREROUTE_RESTRICT ,
our $family; our $family;
our $tcrules; our $convert;
our $mangle; our $mangle;
@ -3246,7 +3246,7 @@ EOF
# Process the mangle file and setup traffic shaping # Process the mangle file and setup traffic shaping
# #
sub setup_tc( $ ) { sub setup_tc( $ ) {
$tcrules = $_[0]; $convert = $_[0];
if ( $config{MANGLE_ENABLED} ) { if ( $config{MANGLE_ENABLED} ) {
ensure_mangle_chain 'tcpre'; ensure_mangle_chain 'tcpre';
@ -3296,7 +3296,7 @@ sub setup_tc( $ ) {
if ( $config{MANGLE_ENABLED} ) { if ( $config{MANGLE_ENABLED} ) {
if ( $tcrules ) { if ( $convert ) {
my $have_tcrules; my $have_tcrules;
my $fn; my $fn;
@ -3331,9 +3331,9 @@ sub setup_tc( $ ) {
convert_tos( $mangle, $fn1 ); convert_tos( $mangle, $fn1 );
close $mangle, directive_callback( 0 ) if $tcrules; close $mangle, directive_callback( 0 );
} elsif ( $tcrules ) { } elsif ( $convert ) {
if ( -f ( my $fn = find_file( 'tcrules' ) ) ) { if ( -f ( my $fn = find_file( 'tcrules' ) ) ) {
if ( unlink $fn ) { if ( unlink $fn ) {
warning_message "Empty tcrules file ($fn) removed"; warning_message "Empty tcrules file ($fn) removed";