Use new syntax in standard actions. Add additional comments in Shorewall::Config

Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9695 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2009-03-16 16:37:21 +00:00
parent b6b8cd4c7f
commit 08cd0684ec
3 changed files with 15 additions and 15 deletions

View File

@ -186,7 +186,7 @@ our %config;
our @propagateconfig = qw/ DISABLE_IPV6 MODULESDIR MODULE_SUFFIX LOGFORMAT SUBSYSLOCK LOCKFILE /; our @propagateconfig = qw/ DISABLE_IPV6 MODULESDIR MODULE_SUFFIX LOGFORMAT SUBSYSLOCK LOCKFILE /;
our @propagateenv = qw/ LOGLIMIT LOGTAGONLY LOGRULENUMBERS /; our @propagateenv = qw/ LOGLIMIT LOGTAGONLY LOGRULENUMBERS /;
# #
# From parsing the capabilities file # From parsing the capabilities file or detecting capabilities
# #
our %capabilities; our %capabilities;
# #
@ -257,15 +257,15 @@ our $scriptfilename; # Name of that file.
our @tempfiles; # Files that need unlinking at END our @tempfiles; # Files that need unlinking at END
our $first_entry; # Message to output or function to call on first non-blank line of a file our $first_entry; # Message to output or function to call on first non-blank line of a file
our $shorewall_dir; # Shorewall Directory our $shorewall_dir; # Shorewall Directory; if non-empty, search here first for files.
our $debug; # If true, use Carp to report errors with stack trace. our $debug; # If true, use Carp to report errors with stack trace.
our $family; our $family; # Protocol family (4 or 6)
our $toolname; our $toolname; # Name of the tool to use (iptables or iptables6)
our $toolNAME; our $toolNAME; # Tool name in CAPS
our $product; our $product; # Name of product that will run the generated script
our $Product; our $Product; # $product with initial cap.
use constant { MIN_VERBOSITY => -1, use constant { MIN_VERBOSITY => -1,
MAX_VERBOSITY => 2 , MAX_VERBOSITY => 2 ,
@ -273,7 +273,7 @@ use constant { MIN_VERBOSITY => -1,
F_IPV6 => 6, F_IPV6 => 6,
}; };
our %validlevels; our %validlevels; # Valid log levels.
# #
# Initialize globals -- we take this novel approach to globals initialization to allow # Initialize globals -- we take this novel approach to globals initialization to allow
@ -302,9 +302,9 @@ sub initialize( $ ) {
$object = 0; # Object (script) file Handle Reference $object = 0; # Object (script) file Handle Reference
$object_enabled = 0; # Write to object file is disabled. $object_enabled = 0; # Write to object file is disabled.
$lastlineblank = 0; # Avoid extra blank lines in the output $lastlineblank = 0; # Avoid extra blank lines in the output
$indent1 = ''; # Current indentation $indent1 = ''; # Current indentation tabs
$indent2 = ''; # Current indentation $indent2 = ''; # Current indentation spaces
$indent = ''; # Current indentation $indent = ''; # Current total indentation
( $dir, $file ) = ('',''); # Object's Directory and File ( $dir, $file ) = ('',''); # Object's Directory and File
$tempfile = ''; # Temporary File Name $tempfile = ''; # Temporary File Name

View File

@ -26,7 +26,7 @@ COUNT
# #
# Reject 'auth' # Reject 'auth'
# #
Auth/REJECT Auth(REJECT)
# #
# Don't log broadcasts # Don't log broadcasts
# #
@ -43,7 +43,7 @@ dropInvalid
# #
# Drop Microsoft noise so that it doesn't clutter up the log. # Drop Microsoft noise so that it doesn't clutter up the log.
# #
SMB/DROP SMB(DROP)
DropUPnP DropUPnP
# #
# Drop 'newnotsyn' traffic so that it doesn't get logged. # Drop 'newnotsyn' traffic so that it doesn't get logged.

View File

@ -22,7 +22,7 @@ COUNT
# #
# Don't log 'auth' -- REJECT # Don't log 'auth' -- REJECT
# #
Auth/REJECT Auth(REJECT)
# #
# Drop Broadcasts so they don't clutter up the log # Drop Broadcasts so they don't clutter up the log
# (broadcasts must *not* be rejected). # (broadcasts must *not* be rejected).
@ -41,7 +41,7 @@ dropInvalid
# #
# Reject Microsoft noise so that it doesn't clutter up the log. # Reject Microsoft noise so that it doesn't clutter up the log.
# #
SMB/REJECT SMB(REJECT)
DropUPnP DropUPnP
# #
# Drop 'newnotsyn' traffic so that it doesn't get logged. # Drop 'newnotsyn' traffic so that it doesn't get logged.