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

More fixes for TC

Browse Source
This commit is contained in:
Tom Eastep 2011-05-01 21:24:52 -07:00
parent 4c27c68c43
commit 46e2a02fe4
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Shorewall/Perl/Shorewall/Config.pm
View File

@ -813,6 +813,7 @@ sub numeric_value1 ( $ ) {
sub hex_value( $ ) {
my $val = lc $_[0];
$val =~ s/^0x//;
return undef unless $val =~ /^[a-fA-F0-9]+$/;
no warnings;
oct '0x' . $val;

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

@ -255,6 +255,7 @@ sub process_tc_rule( ) {
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' || $config{TC_ENABLED} eq 'Shared' ) {
$originalmark =~ s/0x//g;
fatal_error "Unknown Class ($originalmark)}" unless ( $device = $classids{$originalmark} );
fatal_error "IFB Classes may not be specified in tcrules" if @{$tcdevices{$device}{redirected}};
}
@ -763,7 +764,6 @@ sub validate_tc_class( ) {
fatal_error "Invalid INTERFACE:CLASS ($devclass)" if defined $rest;
if ( $device =~ /^(\d+|0x[\da-fA-F]+)$/ ) {
$device =~ s/^0x//;
( $number , $classnumber ) = ( hex_value $device, hex_value $number );
( $device , $devref) = dev_by_number( $number );
} else {