From e582f222ad6b84c952e7c1c9f06601c895665af9 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sat, 28 Nov 2009 07:25:31 -0800 Subject: [PATCH] Backout another Patch from the Virtual Zone Sequence and re-apply a couple of small optimizations --- Shorewall/Perl/Shorewall/Providers.pm | 1 - Shorewall/Perl/Shorewall/Rules.pm | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Providers.pm b/Shorewall/Perl/Shorewall/Providers.pm index ad3a76980..f47b6d58d 100644 --- a/Shorewall/Perl/Shorewall/Providers.pm +++ b/Shorewall/Perl/Shorewall/Providers.pm @@ -311,7 +311,6 @@ sub add_a_provider( ) { } } else { fatal_error "Invalid Mark Value ($mark)" unless $config{HIGH_ROUTE_MARKS} && $config{WIDE_TC_MARKS}; - fatal_error "Invalid Mark Value ($mark)" if $val > 0xf0000; } for my $providerref ( values %providers ) { diff --git a/Shorewall/Perl/Shorewall/Rules.pm b/Shorewall/Perl/Shorewall/Rules.pm index ad85061b1..9e80e32d4 100644 --- a/Shorewall/Perl/Shorewall/Rules.pm +++ b/Shorewall/Perl/Shorewall/Rules.pm @@ -1990,8 +1990,9 @@ sub generate_matrix() { next if $hostref->{options}{sourceonly}; if ( $zone ne $zone1 || $num_ifaces > 1 || $hostref->{options}{routeback} ) { my $ipsec_out_match = match_ipsec_out $zone1 , $hostref; + my $dest_exclusion = dest_exclusion( $hostref->{exclusions}, $chain); for my $net ( @{$hostref->{hosts}} ) { - add_jump $frwd_ref, dest_exclusion( $hostref->{exclusions}, $chain), 0, join( '', match_dest_dev( $interface) , match_dest_net($net), $ipsec_out_match ); + add_jump $frwd_ref, $dest_exclusion, 0, join( '', match_dest_dev( $interface) , match_dest_net($net), $ipsec_out_match ); } } } @@ -2032,6 +2033,7 @@ sub generate_matrix() { for my $host1ref ( @$array1ref ) { next if $host1ref->{options}{sourceonly}; my $ipsec_out_match = match_ipsec_out $zone1 , $host1ref; + my $dest_exclusion = dest_exclusion( $host1ref->{exclusions}, $chain ); for my $net1 ( @{$host1ref->{hosts}} ) { unless ( $interface eq $interface1 && $net eq $net1 && ! $host1ref->{options}{routeback} ) { # @@ -2039,7 +2041,7 @@ sub generate_matrix() { # add_jump( $excl3ref , - dest_exclusion( $host1ref->{exclusions}, $chain ), + $dest_exclusion, 0, join( '', $match_source_dev,