From a2a9ef095887d0291f6bdad861658d677f90eb2b Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Tue, 5 Jun 2012 12:51:52 -0700 Subject: [PATCH] Rename OPTIMIZE_MASK1 to OPTIMIZE_MASK2n4 Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Chains.pm | 8 ++++---- Shorewall/Perl/Shorewall/Compiler.pm | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Chains.pm b/Shorewall/Perl/Shorewall/Chains.pm index 653ed418a..feb83f880 100644 --- a/Shorewall/Perl/Shorewall/Chains.pm +++ b/Shorewall/Perl/Shorewall/Chains.pm @@ -112,7 +112,7 @@ our %EXPORT_TAGS = ( ALL_COMMANDS NOT_RESTORE OPTIMIZE_POLICY_MASK - OPTIMIZE_POLICY_MASK1 + OPTIMIZE_POLICY_MASK2n4 OPTIMIZE_RULESET_MASK OPTIMIZE_MASK @@ -368,9 +368,9 @@ use constant { ALL_COMMANDS => 1, NOT_RESTORE => 2 }; # Optimization masks # use constant { - OPTIMIZE_POLICY_MASK => 0x02 , # Call optimize_policy_chains() - OPTIMIZE_POLICY_MASK1 => 0x06 , - OPTIMIZE_RULESET_MASK => 0x1C , # Call optimize_ruleset() + OPTIMIZE_POLICY_MASK => 0x02 , # Call optimize_policy_chains() + OPTIMIZE_POLICY_MASK2n4 => 0x06 , + OPTIMIZE_RULESET_MASK => 0x1C , # Call optimize_ruleset() }; use constant { OPTIMIZE_MASK => OPTIMIZE_POLICY_MASK | OPTIMIZE_RULESET_MASK }; diff --git a/Shorewall/Perl/Shorewall/Compiler.pm b/Shorewall/Perl/Shorewall/Compiler.pm index dd9973ca6..e96136ebb 100644 --- a/Shorewall/Perl/Shorewall/Compiler.pm +++ b/Shorewall/Perl/Shorewall/Compiler.pm @@ -817,7 +817,7 @@ sub compiler { # # Optimize Policy Chains # - optimize_policy_chains if ( $optimize & OPTIMIZE_POLICY_MASK1 ) == OPTIMIZE_POLICY_MASK; # Level 2 but not 4 + optimize_policy_chains if ( $optimize & OPTIMIZE_POLICY_MASK2n4 ) == OPTIMIZE_POLICY_MASK; # Level 2 but not 4 # # More Optimization # @@ -882,7 +882,7 @@ sub compiler { # # Optimize Policy Chains # - optimize_policy_chains if ( $optimize & OPTIMIZE_POLICY_MASK1 ) == OPTIMIZE_POLICY_MASK; # Level 2 but not 4 + optimize_policy_chains if ( $optimize & OPTIMIZE_POLICY_MASK2n4 ) == OPTIMIZE_POLICY_MASK; # Level 2 but not 4 # # Ruleset Optimization #