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

Cosmetic improvements in tcclasses processing

Browse Source
This commit is contained in:
Tom Eastep 2009-05-03 09:03:00 -07:00
parent 90b07d849d
commit 79adcb964f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -612,10 +612,10 @@ sub validate_tc_class( $$$$$$ ) {
$occurs = numeric_value($val); $occurs = numeric_value($val);
$tcref->{src} = 1 if $3 eq 's'; $tcref->{src} = 1 if $3 eq 's';
fatal_error q(The 'occurs' option is only valid for IPv4) if $family == F_IPV6; fatal_error q(The 'occurs' option is only valid for IPv4) if $family == F_IPV6;
fatal_error "Invalid 'occurs' ($val)" unless defined $occurs && $occurs > 1 && $occurs <= 256; fatal_error "Invalid 'occurs' ($val)" unless defined $occurs && $occurs > 1 && $occurs <= 256;
fatal_error "Invalid 'occurs' ($val)" if $occurs > ( $config{WIDE_TC_MARKS} ? 8191 : 255 ); fatal_error "Invalid 'occurs' ($val)" if $occurs > ( $config{WIDE_TC_MARKS} ? 8191 : 255 );
fatal_error q(Duplicate 'occurs') if $tcref->{occurs} > 1; fatal_error q(Duplicate 'occurs') if $tcref->{occurs} > 1;
fatal_error q(The 'occurs' option is only valid with 'classify') unless $devref->{classify}; fatal_error q(The 'occurs' option is only valid with 'classify') unless $devref->{classify};
fatal_error q(The 'occurs' option is not valid with 'default') if $devref->{default} == $classnumber; fatal_error q(The 'occurs' option is not valid with 'default') if $devref->{default} == $classnumber;
fatal_error q(The 'occurs' option is not valid with 'tos') if @{$tcref->{tos}}; fatal_error q(The 'occurs' option is not valid with 'tos') if @{$tcref->{tos}};
@ -639,9 +639,10 @@ sub validate_tc_class( $$$$$$ ) {
rate => $tcref->{rate} , rate => $tcref->{rate} ,
ceiling => $tcref->{ceiling} , ceiling => $tcref->{ceiling} ,
priority => $tcref->{priority} , priority => $tcref->{priority} ,
mark => $tcref->{classify} ? 0 : ++$markval , mark => 0 ,
flow => $tcref->{flow} , flow => $tcref->{flow} ,
pfifo => $tcref->{pfifo}, pfifo => $tcref->{pfifo},
occurs => 0,
}; };
push @tcclasses, "$device:$classnumber"; push @tcclasses, "$device:$classnumber";
}; };