holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Assume that the conntrack state value in a rule is not a reference.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-02-04 08:29:50 -08:00
parent 475942deb9
commit d8214885f2
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Shorewall/Perl/Shorewall/Chains.pm
View File

@ -3554,17 +3554,18 @@ sub delete_duplicates {
}
#
# Get the 'conntrack' state for the passed rule reference
# Get the 'conntrack' state(s) for the passed rule reference
#
sub get_conntrack( $ ) {
my $ruleref = $_[0];
if ( my $states = $ruleref->{conntrack} ) {
unless ( reftype $states ) {
if ( $states =~ s/--ctstate // ) {
delete $ruleref->{targetopts} unless $ruleref->{targetopts};
$ruleref->{simple} = '' unless $ruleref->{simple};
return $states
}
if ( $states =~ s/--ctstate // ) {
#
# Normalize the rule and return the states.
#
delete $ruleref->{targetopts} unless $ruleref->{targetopts};
$ruleref->{simple} = '' unless $ruleref->{simple};
return $states
}
}
@ -3668,6 +3669,9 @@ sub combine_states {
trace( $chainref, 'D', $rulenum, $ruleref ) if $debug;
} else {
#
# Rule doesn't have the conntrack match
#
last;
}
}