From a7ec75d084a0f194d00d281716338832f4e753dd Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Thu, 15 Apr 2010 10:03:46 -0700 Subject: [PATCH] Fix another add_rule() that should have been an add_jump(). Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Tc.pm | 2 +- Shorewall/changelog.txt | 2 ++ Shorewall/releasenotes.txt | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Shorewall/Perl/Shorewall/Tc.pm b/Shorewall/Perl/Shorewall/Tc.pm index 82868701f..b158f8c42 100644 --- a/Shorewall/Perl/Shorewall/Tc.pm +++ b/Shorewall/Perl/Shorewall/Tc.pm @@ -1374,7 +1374,7 @@ sub setup_tc() { # This is overloading TRACK_PROVIDERS a bit but sending tracked packets through PREROUTING is a PITA for users # for my $interface ( @routemarked_interfaces ) { - add_rule $mangle_table->{PREROUTING} , match_source_dev( $interface ) . "-j tcpre"; + add_jump $mangle_table->{PREROUTING} , 'tcpre', 1, match_source_dev( $interface ); } } } diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index 60aa1fc63..efdedb77f 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -2,6 +2,8 @@ Changes in Shorewall 4.4.8.3 1) Make wildcard interfaces play well with optimize 4. +2) Fix another add_rule() that should have been an add_jump(). + Changes in Shorewall 4.4.8.2 1) Fix OPTIMIZE 4 bug. diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index 4fb630237..d155704e9 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -224,6 +224,10 @@ I I I. P R O B L E M S C O R R E C T E D I N T H I S R E L E A S E ending in '+' has been corrected. The most likely symptom of this problem would be iptables-restore failure. +2) A second problem with optimize 4 has been corrected. This one + manifested as invalid iptables-restore input involving the 'tcpre' + mangle chain. + 4.4.8.2 1) With optimize 4, if an unnecessary NONAT rule was included in