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

Revert change with migration issue

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-01-11 15:30:33 -08:00
parent 0b549c7a15
commit 5b4e9eb8e6
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1182,7 +1182,13 @@ sub setup_tc() {
my $mark_part = ''; my $mark_part = '';
$mark_part = '-m mark --mark 0/' . in_hex( $globals{PROVIDER_MASK} ) . ' ' if @routemarked_interfaces && ! $config{TC_EXPERT}; if ( @routemarked_interfaces && ! $config{TC_EXPERT} ) {
$mark_part = '-m mark --mark 0/' . in_hex( $globals{PROVIDER_MASK} ) . ' ';
for my $interface ( @routemarked_interfaces ) {
add_rule $mangle_table->{PREROUTING} , match_source_dev( $interface ) . "-j tcpre";
}
}
add_jump $mangle_table->{PREROUTING} , 'tcpre', 0, $mark_part; add_jump $mangle_table->{PREROUTING} , 'tcpre', 0, $mark_part;
add_jump $mangle_table->{OUTPUT} , 'tcout', 0, $mark_part; add_jump $mangle_table->{OUTPUT} , 'tcout', 0, $mark_part;

10
Shorewall/releasenotes.txt
View File

@ -169,11 +169,6 @@ Shorewall 4.4.6
now, if the zone has <interface>:0.0.0.0/0 (even with exclusions), now, if the zone has <interface>:0.0.0.0/0 (even with exclusions),
then it may have no additional members in /etc/shorewall/hosts. then it may have no additional members in /etc/shorewall/hosts.
13) Prior versions of Shorewall applied PREROUTING marking rules to all
packets from 'tracked' provider interfaces when
TC_EXPERT=No. Beginning with Shorewall 4.4.6, packets from these
interfaces will only have those rules applied when TC_EXPERT=Yes.
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
P R O B L E M S C O R R E C T E D I N 4 . 4 . 6 P R O B L E M S C O R R E C T E D I N 4 . 4 . 6
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
@ -187,11 +182,6 @@ Shorewall 4.4.6
verifying the existence of the correct ipset utility before using verifying the existence of the correct ipset utility before using
it to save the contents of the sets. it to save the contents of the sets.
2) Prior versions of Shorewall incorrectly applied PREROUTING marking
rules to all packets from 'tracked' provider interfaces when
TC_EXPERT=No. Beginning with Shorewall 4.4.6, packets from these
interfaces will only have those rules applied when TC_EXPERT=Yes.
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
K N O W N P R O B L E M S R E M A I N I N G K N O W N P R O B L E M S R E M A I N I N G
---------------------------------------------------------------------------- ----------------------------------------------------------------------------