Merge branch '4.5.13'

This commit is contained in:
Tom Eastep 2013-01-27 11:26:59 -08:00
commit 2a2e23cb17

View File

@ -223,7 +223,7 @@ sub initialize( $ ) {
# #
sub new_rules_chain( $ ) { sub new_rules_chain( $ ) {
my $chainref = new_chain( 'filter', $_[0] ); my $chainref = new_chain( 'filter', $_[0] );
$chainref->{sections} = {}; $chainref->{sections} = $config{FASTACCEPT} ? { RELATED => 1, ESTABLISHED => 1 } : {};
$chainref; $chainref;
} }
@ -902,7 +902,18 @@ sub finish_chain_section ($$$) {
last; last;
} }
add_ijump( $chainref, g => $target, state_imatch $_ ) if $target; if ( $target ) {
#
# Always handle ESTABLISHED first
#
if ( $state{ESTABLISHED} ) {
add_ijump( $chain1ref, j => 'ACCEPT', state_imatch 'ESTABLISHED' );
delete $state{ESTABLISHED};
}
add_ijump( $chainref, g => $target, state_imatch $_ );
}
delete $state{$_}; delete $state{$_};
} }
} }