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

Release document update; cosmetic change to Shorewall::Tc

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7936 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-12-21 22:56:36 +00:00
parent d8a0db63bd
commit 44545e71fe
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall-common/changelog.txt
View File

@ -14,6 +14,8 @@ Changes in 4.1.3
7) Detect lack of interfaces and IPv4 zones. 7) Detect lack of interfaces and IPv4 zones.
8) Classify marked traffic using tc filter rules.
Changes in 4.1.2 Changes in 4.1.2
1) Enhanced Operational Logging 1) Enhanced Operational Logging

4
Shorewall-common/releasenotes.txt
View File

@ -43,6 +43,10 @@ Other changes in Shorewall 4.1.3.
3) Shorewall-perl now generates fatal error conditions when there are 3) Shorewall-perl now generates fatal error conditions when there are
no IPv4 zones defined and when there are no interfaces defined. no IPv4 zones defined and when there are no interfaces defined.
4) Shorewall now unconditionally uses tc filter rules to classify
traffic by MARK value. Previously, Shorewall used the CLASSIFY
target in the POSTROUTING chain if it was available.
Migration Issues. Migration Issues.
1) Previously, when HIGH_ROUTE_MARKS=Yes, Shorewall allowed non-zero 1) Previously, when HIGH_ROUTE_MARKS=Yes, Shorewall allowed non-zero

8
Shorewall-perl/Shorewall/Tc.pm
View File

@ -497,7 +497,7 @@ sub setup_traffic_shaping() {
my $devref = $tcdevices{$device}; my $devref = $tcdevices{$device};
my $tcref = $tcclasses{$device}{$mark}; my $tcref = $tcclasses{$device}{$mark};
my $devnum = $devref->{number}; my $devnum = $devref->{number};
my $classid = "$devnum:${prefix}${mark}"; my $classid = join( '', $devnum, ':', $prefix, $mark);
my $rate = $tcref->{rate}; my $rate = $tcref->{rate};
my $quantum = calculate_quantum $rate, calculate_r2q( $devref->{out_bandwidth} ); my $quantum = calculate_quantum $rate, calculate_r2q( $devref->{out_bandwidth} );
my $dev = chain_base $device; my $dev = chain_base $device;
@ -518,13 +518,11 @@ sub setup_traffic_shaping() {
emit ( "[ \$${dev}_mtu -gt $quantum ] && quantum=\$${dev}_mtu || quantum=$quantum", emit ( "[ \$${dev}_mtu -gt $quantum ] && quantum=\$${dev}_mtu || quantum=$quantum",
"run_tc class add dev $device parent $devref->{number}:1 classid $classid htb rate $rate ceil $tcref->{ceiling} prio $tcref->{priority} \$${dev}_mtu1 quantum \$quantum", "run_tc class add dev $device parent $devref->{number}:1 classid $classid htb rate $rate ceil $tcref->{ceiling} prio $tcref->{priority} \$${dev}_mtu1 quantum \$quantum",
"run_tc qdisc add dev $device parent $classid handle ${prefix}${mark}: sfq perturb 10" "run_tc qdisc add dev $device parent $classid handle ${prefix}${mark}: sfq perturb 10"
); );
# #
# add filters # add filters
# #
unless ( $devref->{classify} ) { emit "run_tc filter add dev $device protocol ip parent $devnum:0 prio 1 handle $mark fw classid $classid" unless $devref->{classify};
emit "run_tc filter add dev $device protocol ip parent $devnum:0 prio 1 handle $mark fw classid $classid";
}
# #
#options #options
# #