extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-01-18 11:38:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Yet another ':' parsing issue

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8364 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2008-03-26 16:16:56 +00:00
parent 5288b1d64d
commit bbc8577a30
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Shorewall-common/releasenotes.txt
View File

@ -95,6 +95,9 @@ Problems corrected in Shorewall-perl 4.1.7.
6) An INTERFACE of ":" in /etc/shorewall/interfaces would produce Perl
run-time errors.
6) A MARK of ":" in /etc/shorewall/tcrules would produce Perl
run-time errors.
New Features in 4.1.7.
1) If an interface fails when using balanced multi-ISP routing, the

18
Shorewall-perl/Shorewall/Tc.pm
View File

@ -180,13 +180,11 @@ INIT {
}
sub process_tc_rule( $$$$$$$$$$$ ) {
my ( $mark, $source, $dest, $proto, $ports, $sports, $user, $testval, $length, $tos , $connbytes ) = @_;
my ( $originalmark, $source, $dest, $proto, $ports, $sports, $user, $testval, $length, $tos , $connbytes ) = @_;
my $original_mark = $mark;
my ( $mark, $designator, $remainder ) = split( /:/, $originalmark, 3 );
( $mark, my ( $designator, $remainder ) ) = split( /:/, $mark, 3 );
fatal_error "Invalid MARK" if defined $remainder;
fatal_error "Invalid MARK ($originalmark)" if defined $remainder || ! defined $mark;
my $chain = $globals{MARKING_CHAIN};
my $target = 'MARK --set-mark';
@ -220,15 +218,15 @@ sub process_tc_rule( $$$$$$$$$$$ ) {
require_capability ('CONNMARK' , "CONNMARK Rules", '' ) if $connmark;
} else {
fatal_error "Invalid MARK ($original_mark)" unless $mark =~ /^([0-9]+|0x[0-9a-f]+)$/ and $designator =~ /^([0-9]+|0x[0-9a-f]+)$/;
fatal_error "Invalid MARK ($originalmark)" unless $mark =~ /^([0-9]+|0x[0-9a-f]+)$/ and $designator =~ /^([0-9]+|0x[0-9a-f]+)$/;
if ( $config{TC_ENABLED} eq 'Internal' ) {
fatal_error "Unknown Class ($original_mark)}" unless ( $device = $classids{$original_mark} );
fatal_error "Unknown Class ($originalmark)}" unless ( $device = $classids{$originalmark} );
}
$chain = 'tcpost';
$classid = 1;
$mark = $original_mark;
$mark = $originalmark;
$target = 'CLASSIFY --set-class';
}
}
@ -256,7 +254,7 @@ sub process_tc_rule( $$$$$$$$$$$ ) {
}
if ( $rest ) {
fatal_error "Invalid MARK ($original_mark)" if $marktype == NOMARK;
fatal_error "Invalid MARK ($originalmark)" if $marktype == NOMARK;
$mark = $rest if $tccmd->{mask};
@ -296,7 +294,7 @@ sub process_tc_rule( $$$$$$$$$$$ ) {
#
# expand_rule() returns destination device if any
#
fatal_error "Class Id $original_mark is not associated with device $result" if $device ne $result;
fatal_error "Class Id $originalmark is not associated with device $result" if $device ne $result;
}
progress_message " TC Rule \"$currentline\" $done";