extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-25 04:01:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

More global initialization fixes

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6653 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-06-23 16:32:37 +00:00
parent 3151db4561
commit 582e802efc
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Shorewall-perl/Shorewall/Chains.pm
View File

@ -202,6 +202,17 @@ our %interfaceaddr;
our %interfaceaddrs; our %interfaceaddrs;
our %interfacenets; our %interfacenets;
our @builtins = qw(PREROUTING INPUT FORWARD OUTPUT POSTROUTING);
#
# State of the generator.
#
use constant { NULL_STATE => 0 , # Generating neither shell commands nor iptables-restore input
CAT_STATE => 1 , # Generating iptables-restore input
CMD_STATE => 2 }; # Generating shell commands.
our $state;
# #
# Initialize globals -- we take this novel approach to globals initialization to allow # Initialize globals -- we take this novel approach to globals initialization to allow
# the compiler to run multiple times in the same process. The # the compiler to run multiple times in the same process. The
@ -287,6 +298,10 @@ sub initialize() {
%interfaceaddr = (); %interfaceaddr = ();
%interfaceaddrs = (); %interfaceaddrs = ();
%interfacenets = (); %interfacenets = ();
#
# State of the generator.
#
$state = NULL_STATE;
} }
INIT { INIT {
@ -1799,16 +1814,6 @@ sub insertnatjump( $$$$ ) {
# #
# What follows is the code that generates the input to iptables-restore # What follows is the code that generates the input to iptables-restore
# #
my @builtins = qw(PREROUTING INPUT FORWARD OUTPUT POSTROUTING);
#
# State of the generator.
#
use constant { NULL_STATE => 0 , # Generating neither shell commands nor iptables-restore input
CAT_STATE => 1 , # Generating iptables-restore input
CMD_STATE => 2 }; # Generating shell commands.
my $state = NULL_STATE;
# #
# Emits the passed 'rule' # Emits the passed 'rule'

11
Shorewall-perl/Shorewall/Rules.pm
View File

@ -61,7 +61,9 @@ our @rule_chains;
# Set to one if we find a SECTION # Set to one if we find a SECTION
# #
our $sectioned; our $sectioned;
our $macro_nest_level;
our $current_param;
our @param_stack;
# #
# Initialize globals -- we take this novel approach to globals initialization to allow # Initialize globals -- we take this novel approach to globals initialization to allow
# the compiler to run multiple times in the same process. The # the compiler to run multiple times in the same process. The
@ -74,6 +76,9 @@ our $sectioned;
sub initialize() { sub initialize() {
@rule_chains = (); @rule_chains = ();
$sectioned = 0; $sectioned = 0;
$macro_nest_level = 0;
$current_param = '';
@param_stack;
} }
INIT { INIT {
@ -887,10 +892,6 @@ sub process_macro ( $$$$$$$$$$$$$ ) {
progress_message "..End Macro $macrofile" progress_message "..End Macro $macrofile"
} }
my $macro_nest_level = 0;
my $current_param = '';
my @param_stack;
# #
# Once a rule has been completely resolved by macro expansion and wildcard (source and/or dest zone == 'all'), it is processed by this function. # Once a rule has been completely resolved by macro expansion and wildcard (source and/or dest zone == 'all'), it is processed by this function.
# #