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

Integerize r2q before using it in a 'qdisc add' command

Browse Source
This commit is contained in:
Tom Eastep 2009-06-14 14:29:12 -07:00
parent f02cddd780
commit a6d2497653
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1017,7 +1017,7 @@ sub setup_traffic_shaping() {
my $devref = $tcdevices{$device};
my $defmark = in_hexp ( $devref->{default} || 0 );
my $devnum = in_hexp $devref->{number};
my $r2q = calculate_r2q $devref->{out_bandwidth};
my $r2q = int calculate_r2q $devref->{out_bandwidth};
emit "if interface_is_up $device; then";

8
Shorewall/changelog.txt
View File

@ -1,3 +1,11 @@
Changes in Shorewall 4.4.0-Beta2
1) The 'find_first_interface_address()' and
'find_first_interface_address_if_any()' functions have been restored to
lib.base.
2) Integerize r2q before inserting it into 'tc qdisc add root' command.
Changes in Shorewall 4.4.0-Beta1
1) Correct typo in Shorewall6 two-interface sample shorewall.conf.

17
Shorewall/releasenotes.txt
View File

@ -1,4 +1,4 @@
Shorewall 4.4.0 Beta 1
Shorewall 4.4.0 Beta 2
----------------------------------------------------------------------------
R E L E A S E 4 . 4 H I G H L I G H T S
@ -102,14 +102,17 @@ Shorewall 4.4.0 Beta 1
using NULL_ROUTE_RFC1918=Yes instead.
----------------------------------------------------------------------------
P R O B L E M S C O R R E C T E D I N 4 . 4 . 0 Beta 1
P R O B L E M S C O R R E C T E D I N 4 . 4 . 0 Beta 2
----------------------------------------------------------------------------
1) A typo in the IPv6 two-interface Sample shorewall6.conf file has
been corrected.
1) The find_first_interface_address() and
find_first_interface_addresss_if_any() functions were not in scope when
/etc/shorewall/params was processed.
2) When a valid mnemonic such as 'tos-minimize-delay' appeared in the TOS
column of /etc/shorewall/tcfilters, a compile-time error resulted.
2) The compiled script could fail with an error such as the following
when the internal traffic shaper was enabled:
ERROR: Command "tc qdisc add dev dsl0 root handle 1: htb default 0 r2q 5.5" Failed
----------------------------------------------------------------------------
K N O W N P R O B L E M S R E M A I N I N G
@ -118,7 +121,7 @@ Shorewall 4.4.0 Beta 1
None.
----------------------------------------------------------------------------
N E W F E A T U R E S I N 4 . 4 . 0 Beta 1
N E W F E A T U R E S I N 4 . 4 . 0 Beta 2
----------------------------------------------------------------------------
None.