extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-07 18:26:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Groundwork for adding commmand line control

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5470 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-03-09 00:03:04 +00:00
parent 5f9eb40d37
commit 87af1c45e2
1 changed files with 89 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
New/compiler.pl
View File

@ -1087,10 +1087,11 @@ sub merge_levels ($$) {
push @subparts, '' while @subparts < 3; #Avoid undefined values push @subparts, '' while @subparts < 3; #Avoid undefined values
my $level = $supparts[1]; my $level = $supparts[1];
my $tag = $supparts[2];
if ( @supparts == 3 ) { if ( @supparts == 3 ) {
return "$target:none!:$supparts[2]" if $level eq 'none!'; return "$target:none!:$tag" if $level eq 'none!';
return "$target:$level:$supparts[2]" if $level =~ /!$/; return "$target:$level:$tag" if $level =~ /!$/;
return $subordinate if $subparts >= 2; return $subordinate if $subparts >= 2;
return "$target:$level"; return "$target:$level";
} }
@ -5237,15 +5238,7 @@ sub do_initialize() {
initialize_chain_table; initialize_chain_table;
} }
# sub compile_firewall() {
# E x e c u t i o n S t a r t s H e r e
#
$ENV{VERBOSE} = 2 if $ENV{DEBUG};
#
# Get shorewall.conf and capabilities.
#
do_initialize;
# #
# Process the zones file. # Process the zones file.
# #
@ -5255,7 +5248,6 @@ progress_message2 "Determining Zones..."; determine_zones;
# #
progress_message2 "Validating interfaces file..."; validate_interfaces_file; dump_interface_info if $ENV{DEBUG}; progress_message2 "Validating interfaces file..."; validate_interfaces_file; dump_interface_info if $ENV{DEBUG};
# #
#
# Process the hosts file. # Process the hosts file.
# #
progress_message2 "Validating hosts file..."; validate_hosts_file; progress_message2 "Validating hosts file..."; validate_hosts_file;
@ -5326,3 +5318,16 @@ progress_message2 "Generating Rule Matrix..."; generate_matrix;
# Create the script. # Create the script.
# #
progress_message2 "Creating iptables-restore file..."; create_iptables_restore_file; progress_message2 "Creating iptables-restore file..."; create_iptables_restore_file;
}
#
# E x e c u t i o n S t a r t s H e r e
#
$ENV{VERBOSE} = 2 if $ENV{DEBUG};
#
# Get shorewall.conf and capabilities.
#
do_initialize;
compile_firewall;