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

Restore IN_BANDWIDTH functionality on moribund distributions

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-11-01 07:02:32 -07:00
parent 8b8140cc9f
commit cfa33e894f
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -537,6 +537,8 @@ sub process_in_bandwidth( $ ) {
my $in_decay = '4sec'; my $in_decay = '4sec';
if ( $in_rate =~ s/^~// ) { if ( $in_rate =~ s/^~// ) {
require_capability 'BASIC_FILTER', 'An estimated policing filter', 's';
if ( $in_rate =~ /:/ ) { if ( $in_rate =~ /:/ ) {
( $in_rate, $in_interval, $in_decay ) = split /:/, $in_rate, 3; ( $in_rate, $in_interval, $in_decay ) = split /:/, $in_rate, 3;
fatal_error "Invalid IN-BANDWIDTH ($in_band)" unless supplied( $in_interval ) && supplied( $in_decay ); fatal_error "Invalid IN-BANDWIDTH ($in_band)" unless supplied( $in_interval ) && supplied( $in_decay );
@ -576,14 +578,25 @@ sub handle_in_bandwidth( $$ ) {
my ($physical, $arrayref ) = @_;; my ($physical, $arrayref ) = @_;;
my ($in_rate, $in_burst, $in_avrate, $in_interval, $in_decay ) = @$arrayref; my ($in_rate, $in_burst, $in_avrate, $in_interval, $in_decay ) = @$arrayref;
emit ( "run_tc qdisc add dev $physical handle ffff: ingress", emit ( "run_tc qdisc add dev $physical handle ffff: ingress" );
"run_tc filter add dev $physical parent ffff: protocol all prio 10 " .
"\\\n estimator $in_interval $in_decay basic\\" ); if ( have_capability 'BASIC_FILTER' ) {
emit( "run_tc filter add dev $physical parent ffff: protocol all prio 10 " .
"\\\n estimator $in_interval $in_decay basic \\" );
if ( $in_rate ) { if ( $in_rate ) {
emit( " police mpu 64 rate ${in_rate}kbit burst $in_burst action drop\n" ); emit( " police mpu 64 rate ${in_rate}kbit burst $in_burst action drop\n" );
} else {
emit( " police avrate ${in_avrate}kbit action drop\n" );
}
} else { } else {
emit( " police avrate ${in_avrate}kbit action drop\n" ); emit( "run_tc filter add dev $physical parent ffff: protocol all prio 10 " .
"\\\n u32 match ip src " . ALLIPv4 . ' ' .
"\\\n police rate ${in_rate}kbit burst $in_burst drop flowid :1",
'',
"run_tc filter add dev $physical parent ffff: protocol all prio 10 " .
"\\\n u32 match ip6 src " . ALLIPv6 . ' ' .
"\\\n police rate ${in_rate}kbit burst $in_burst drop flowid :1\n" );
} }
} }