extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-25 00:53:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Allow leading 's' & 'd' to be omitted when specifying two rates"

Browse Source 
This reverts commit 23bc6f1ab5.
This commit is contained in:
Tom Eastep 2018-12-16 10:06:34 -08:00
parent f0c75b5119
commit cb3273b13b
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Shorewall/Perl/Shorewall/Chains.pm
View File

@ -5350,17 +5350,8 @@ sub do_ratelimit( $$ ) {
my @rates = split_list3 $rates, 'rate'; my @rates = split_list3 $rates, 'rate';
if ( @rates == 2 ) { if ( @rates == 2 ) {
if ( $rates[0] =~ m|^/\d+:| ) { $rates[0] = 's:' . $rates[0] unless $rates[0] =~ /^s(?:\/\d+)?:/;
$rates[0] = 's' . $rates[0]; $rates[1] = 'd:' . $rates[1] unless $rates[1] =~ /^d(?:\/\d+)?:/;
} else {
$rates[0] = 's:' . $rates[0] unless $rates[0] =~ m|^s(?:/\d+)?:|;
}
if ( $rates[1] =~ m|^/\d+:| ) {
$rates[1] = 'd' . $rates[1];
} else {
$rates[1] = 'd:' . $rates[1] unless $rates[1] =~ m|^d(?:/\d+)?:|;
}
} elsif ( @rates > 2 ) { } elsif ( @rates > 2 ) {
fatal error "Only two rates may be specified"; fatal error "Only two rates may be specified";
} }