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

Slight optimization -- also makes code easier to read

Browse Source
This commit is contained in:
Tom Eastep 2009-09-08 16:00:40 -07:00
parent b4712a93fa
commit 128edd4bba
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Shorewall/Perl/Shorewall/Compiler.pm
View File

@ -623,7 +623,9 @@ sub compiler {
validate_interfaces_file ( $export ); validate_interfaces_file ( $export );
# #
# Process the hosts file. # Process the hosts file.
# # # We must reinitialize Shorewall::Chains before generating the iptables-restore input
# for stopping the firewall
validate_hosts_file; validate_hosts_file;
# #
# Report zone contents # Report zone contents
@ -795,15 +797,13 @@ sub compiler {
# (Produces setup_netfilter(), chainlist_reload() and define_firewall() ) # (Produces setup_netfilter(), chainlist_reload() and define_firewall() )
# #
generate_script_3( $chains ); generate_script_3( $chains );
} #
# We must reinitialize Shorewall::Chains before generating the iptables-restore input
# We must reinitialize Shorewall::Chains before generating the iptables-restore input # for stopping the firewall
# for stopping the firewall #
# Shorewall::Chains::initialize( $family );
Shorewall::Chains::initialize( $family ); initialize_chain_table;
initialize_chain_table; #
if ( $objectfile ) {
# S T O P _ F I R E W A L L # S T O P _ F I R E W A L L
# (Writes the stop_firewall() function to the compiled script) # (Writes the stop_firewall() function to the compiled script)
# #
@ -829,6 +829,12 @@ sub compiler {
# #
enable_object, generate_aux_config if $export; enable_object, generate_aux_config if $export;
} else { } else {
#
# Re-initialize the chain table so that process_routestopped() has the same
# environment that it would when called by compile_stop_firewall().
#
Shorewall::Chains::initialize( $family );
initialize_chain_table;
# #
# compile_stop_firewall() also validates the routestopped file. Since we don't # compile_stop_firewall() also validates the routestopped file. Since we don't
# call that function during 'check', we must validate routestopped here. # call that function during 'check', we must validate routestopped here.