Some more global variable [re]initialization cleanup

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6594 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-06-18 23:04:17 +00:00
parent 95e573ce17
commit 5aa19f596e
5 changed files with 5 additions and 27 deletions

View File

@ -55,9 +55,7 @@ our @VERSION = 1.00;
# Used Actions. Each action that is actually used has an entry with value 1. # Used Actions. Each action that is actually used has an entry with value 1.
# #
our %usedactions; our %usedactions;
## Firewall to DMZ
# #
# Default actions for each policy. # Default actions for each policy.
# #
our %default_actions; our %default_actions;
@ -85,6 +83,7 @@ my %logactionchains;
# #
sub initialize() { sub initialize() {
%usedactions = ();
%default_actions = ( DROP => 'none' , %default_actions = ( DROP => 'none' ,
REJECT => 'none' , REJECT => 'none' ,
ACCEPT => 'none' , ACCEPT => 'none' ,

View File

@ -275,7 +275,7 @@ sub initialize() {
# #
# Sequence for naming temporary chains # Sequence for naming temporary chains
# #
our $chainseq; $chainseq = undef;
} }
INIT { INIT {

View File

@ -78,8 +78,8 @@ our %config;
# #
# Config options and global settings that are to be copied to object script # Config options and global settings that are to be copied to object script
# #
our @propagateconfig; our @propagateconfig = qw/ DISABLE_IPV6 MODULESDIR MODULE_SUFFIX LOGFORMAT SUBSYSLOCK LOCKFILE /;
our @propagateenv; our @propagateenv = qw/ LOGLIMIT LOGTAGONLY LOGRULENUMBERS /;
# #
# From parsing the capabilities file # From parsing the capabilities file
# #
@ -227,11 +227,6 @@ sub initialize() {
TCP_FLAGS_DISPOSITION => undef, TCP_FLAGS_DISPOSITION => undef,
BLACKLIST_DISPOSITION => undef, BLACKLIST_DISPOSITION => undef,
); );
#
# Config options and global settings that are to be copied to object script
#
@propagateconfig = qw/ DISABLE_IPV6 MODULESDIR MODULE_SUFFIX LOGFORMAT SUBSYSLOCK LOCKFILE /;
@propagateenv = qw/ LOGLIMIT LOGTAGONLY LOGRULENUMBERS /;
# #
# From parsing the capabilities file # From parsing the capabilities file

View File

@ -64,7 +64,6 @@ our @providers;
# #
sub initialize() { sub initialize() {
@providers = ();
%routemarked_interfaces = (); %routemarked_interfaces = ();
@routemarked_interfaces = (); @routemarked_interfaces = ();
$balance = 0; $balance = 0;

View File

@ -94,21 +94,6 @@ our @zones;
our %zones; our %zones;
our $firewall_zone; our $firewall_zone;
#
# Interface Table.
#
# @interfaces lists the interface names in the order that they appear in the interfaces file.
#
# %interfaces { <interface1> => { root => <name without trailing '+'>
# broadcast => [ <bcast1>, ... ]
# options => { <option1> = <val1> ,
# ...
# }
# zone => <zone name>
# }
#
our %interfaces;
our %reservedName = ( all => 1, our %reservedName = ( all => 1,
none => 1, none => 1,
SOURCE => 1, SOURCE => 1,
@ -126,7 +111,7 @@ our %reservedName = ( all => 1,
sub initialize() { sub initialize() {
@zones = (); @zones = ();
%zones = (); %zones = ();
%interfaces = (); $firewall_zone = '';
} }
INIT { INIT {