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

Impose some structure on setting rule options

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-07-16 14:46:34 -07:00
parent 0f742187ae
commit 27621fa0f9
1 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -395,6 +395,34 @@ my %builtin_target = ( ACCEPT => 1,
my %ipset_exists; my %ipset_exists;
use constant { UNIQUE => 1,
TARGET => 2,
EXCLUSIVE => 4,
MATCH => 8,
CONTROL => 16 };
my %special = ( rule => CONTROL,
mode => CONTROL,
cmdlevel => CONTROL,
simple => CONTROL,
i => UNIQUE,
s => UNIQUE,
o => UNIQUE,
d => UNIQUE,
p => UNIQUE,
comment => CONTROL,
policy => MATCH,
state => EXCLUSIVE,
ctstate => EXCLUSIVE,
jump => TARGET,
target => TARGET,
targetopts => TARGET );
# #
# Rather than initializing globals in an INIT block or during declaration, # Rather than initializing globals in an INIT block or during declaration,
# we initialize them in a function. This is done for two reasons: # we initialize them in a function. This is done for two reasons:
@ -528,10 +556,22 @@ sub set_rule_option( $$$ ) {
assert( defined $value ); assert( defined $value );
$ruleref->{simple} = 0;
my $special = $special{$option} || MATCH;
if ( exists $ruleref->{$option} ) { if ( exists $ruleref->{$option} ) {
assert( defined $ruleref->{$option} ); assert( defined $ruleref->{$option} );
$ruleref->{$option} = [ $ruleref->{$option} ] unless reftype $ruleref->{$option}; if ( $special != EXCLUSIVE ) {
push @{$ruleref->{$option}}, ( reftype $value ? @$value : $value ); if ( $special == UNIQUE ) {
$ruleref->{$option} = $value;
} elsif ( $special == MATCH ) {
$ruleref->{$option} = [ $ruleref->{$option} ] unless reftype $ruleref->{$option};
push @{$ruleref->{$option}}, ( reftype $value ? @$value : $value );
} else {
assert(0);
}
}
} else { } else {
$ruleref->{$option} = $value; $ruleref->{$option} = $value;
} }
@ -632,28 +672,6 @@ sub set_rule_target( $$$ ) {
1 1
} }
my %special = ( rule => 1,
mode => 1,
cmdlevel => 1,
simple => 1,
i => 1,
s => 1,
o => 1,
d => 1,
p => 1,
comment => 1,
policy => 1,
state => 1,
ctstate => 1,
jump => 1,
target => 1,
targetopts => 1 );
# #
# Convert a transformed rule into iptables input # Convert a transformed rule into iptables input
# #