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

Minor cleanup of Rules file

Browse Source 
- Correct comments
- Delete stale comments
- Simplify a statement in process_rules1()

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-02-03 09:53:43 -08:00
parent cdf284a4ee
commit 5c30c236a3
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Shorewall/Perl/Shorewall/Rules.pm
View File

@ -1428,7 +1428,7 @@ sub process_rule1 ( $$$$$$$$$$$$$$$$$ );
# #
# Populate an action invocation chain. As new action tuples are encountered, # Populate an action invocation chain. As new action tuples are encountered,
# the function will be called recursively by process_rules_common(). # the function will be called recursively by process_rule1().
# #
sub process_action( $) { sub process_action( $) {
my $chainref = shift; my $chainref = shift;
@ -1716,9 +1716,7 @@ sub process_rule1 ( $$$$$$$$$$$$$$$$ $) {
# #
fatal_error "Macro invocations nested too deeply" if ++$macro_nest_level > MAX_MACRO_NEST_LEVEL; fatal_error "Macro invocations nested too deeply" if ++$macro_nest_level > MAX_MACRO_NEST_LEVEL;
if ( $param ne '' ) { $current_param = $param unless $param eq '' || $param eq 'PARAM';
$current_param = $param unless $param eq 'PARAM';
}
my $generated = process_macro( $basictarget, my $generated = process_macro( $basictarget,
$chainref, $chainref,
@ -2472,9 +2470,7 @@ sub classic_blacklist() {
my @vservers = vserver_zones; my @vservers = vserver_zones;
my @state = $config{BLACKLISTNEWONLY} ? $globals{UNTRACKED} ? state_imatch 'NEW,INVALID,UNTRACKED' : state_imatch 'NEW,INVALID' : (); my @state = $config{BLACKLISTNEWONLY} ? $globals{UNTRACKED} ? state_imatch 'NEW,INVALID,UNTRACKED' : state_imatch 'NEW,INVALID' : ();
my $result; my $result;
#
# First take care of classic blacklisting
#
for my $zone ( @zones ) { for my $zone ( @zones ) {
my $zoneref = find_zone( $zone ); my $zoneref = find_zone( $zone );
my $simple = @zones <= 2 && ! $zoneref->{options}{complex}; my $simple = @zones <= 2 && ! $zoneref->{options}{complex};
@ -2530,7 +2526,7 @@ sub classic_blacklist() {
} }
# #
# Process the Rules File # Process the BLRules and Rules Files
# #
sub process_rules() { sub process_rules() {
my $blrules = classic_blacklist; my $blrules = classic_blacklist;