extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-21 05:41:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert tcpri change

Browse Source
This commit is contained in:
Tom Eastep 2011-04-04 09:14:46 -07:00
parent f62287ccbf
commit 7466895919
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1330,7 +1330,7 @@ sub setup_simple_traffic_shaping() {
first_entry first_entry
sub { sub {
progress_message2 "$doing $fn1..."; progress_message2 "$doing $fn1...";
warning_message "There are entries in $fn1 but $fn was empty" unless $interfaces; warning_message "There are entries in $fn1 but $fn was empty" unless $interfaces || $family == F_IPV6;
}; };
process_tc_priority while read_a_line; process_tc_priority while read_a_line;
@ -1339,7 +1339,6 @@ sub setup_simple_traffic_shaping() {
if ( $ipp2p ) { if ( $ipp2p ) {
insert_rule1 $mangle_table->{tcpost} , 0 , '-m mark --mark 0/' . in_hex( $globals{TC_MASK} ) . ' -j CONNMARK --restore-mark --ctmask ' . in_hex( $globals{TC_MASK} ); insert_rule1 $mangle_table->{tcpost} , 0 , '-m mark --mark 0/' . in_hex( $globals{TC_MASK} ) . ' -j CONNMARK --restore-mark --ctmask ' . in_hex( $globals{TC_MASK} );
insert_rule1 $mangle_table->{tcpost} , 1 , '-m mark ! --mark 0/' . in_hex( $globals{TC_MASK} ) . ' -j RETURN';
add_rule $mangle_table->{tcpost} , '-m mark ! --mark 0/' . in_hex( $globals{TC_MASK} ) . ' -j CONNMARK --save-mark --ctmask ' . in_hex( $globals{TC_MASK} ); add_rule $mangle_table->{tcpost} , '-m mark ! --mark 0/' . in_hex( $globals{TC_MASK} ) . ' -j CONNMARK --save-mark --ctmask ' . in_hex( $globals{TC_MASK} );
} }
} }

7
Shorewall/releasenotes.txt
View File

@ -124,13 +124,6 @@ Beta 1
6) The contents of the Netfilter mangle table are now included in the 6) The contents of the Netfilter mangle table are now included in the
output from 'shorewall show tc'. output from 'shorewall show tc'.
7) When simple traffic shaping is configured, the postrouting marking
chain 'tcpost' is now exited early if the connection was previously
marked.
Note: tcpost is usually deleted by optimization level 4 and its
rules appear in the POSTROUTING chain.
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
I V. R E L E A S E 4 . 4 H I G H L I G H T S I V. R E L E A S E 4 . 4 H I G H L I G H T S
---------------------------------------------------------------------------- ----------------------------------------------------------------------------