diff --git a/Shorewall/Perl/Shorewall/Rules.pm b/Shorewall/Perl/Shorewall/Rules.pm index 01411e7b0..d8754bc28 100644 --- a/Shorewall/Perl/Shorewall/Rules.pm +++ b/Shorewall/Perl/Shorewall/Rules.pm @@ -777,7 +777,11 @@ sub process_a_policy() { our @zonelist; my ( $clients, $servers, $policy, $loglevel, $synparams, $connlimit ) = - split_line 'policy file', { source => 0, dest => 1, policy => 2, loglevel => 3, limit => 4, connlimit => 5 } ; + split_line2( 'policy file', + { source => 0, dest => 1, policy => 2, loglevel => 3, limit => 4, rate => 4, connlimit => 5 } , + {} , # nopad + 6 , # maxcolumns + ); $loglevel = '' if $loglevel eq '-'; $synparams = '' if $synparams eq '-'; diff --git a/Shorewall/Samples/Universal/policy b/Shorewall/Samples/Universal/policy index c8883d58e..05144ef13 100644 --- a/Shorewall/Samples/Universal/policy +++ b/Shorewall/Samples/Universal/policy @@ -7,7 +7,6 @@ # http://www.shorewall.net/manpages/shorewall-policy.html # ############################################################################### -#SOURCE DEST POLICY LOG LIMIT: CONNLIMIT: -# LEVEL BURST MASK +#SOURCE DEST POLICY LOGLEVEL RATE CONNLIMIT $FW net ACCEPT net all DROP $LOG_LEVEL diff --git a/Shorewall/Samples/one-interface/policy b/Shorewall/Samples/one-interface/policy index 9817d997c..fa6de1513 100644 --- a/Shorewall/Samples/one-interface/policy +++ b/Shorewall/Samples/one-interface/policy @@ -11,8 +11,8 @@ #----------------------------------------------------------------------------- # For information about entries in this file, type "man shorewall-policy" ############################################################################### -#SOURCE DEST POLICY LOG LEVEL LIMIT:BURST -$FW net ACCEPT -net all DROP $LOG_LEVEL +#SOURCE DEST POLICY LOGLEVEL RATE CONNLIMIT +$FW net ACCEPT +net all DROP $LOG_LEVEL # The FOLLOWING POLICY MUST BE LAST -all all REJECT $LOG_LEVEL +all all REJECT $LOG_LEVEL diff --git a/Shorewall/Samples/three-interfaces/policy b/Shorewall/Samples/three-interfaces/policy index b5df41fb3..bdc512938 100644 --- a/Shorewall/Samples/three-interfaces/policy +++ b/Shorewall/Samples/three-interfaces/policy @@ -11,9 +11,9 @@ #------------------------------------------------------------------------------ # For information about entries in this file, type "man shorewall-policy" ############################################################################### -#SOURCE DEST POLICY LOG LEVEL LIMIT:BURST +#SOURCE DEST POLICY LOGLEVEL RATE CONNLIMIT -loc net ACCEPT -net all DROP $LOG_LEVEL +loc net ACCEPT +net all DROP $LOG_LEVEL # THE FOLLOWING POLICY MUST BE LAST -all all REJECT $LOG_LEVEL +all all REJECT $LOG_LEVEL diff --git a/Shorewall/Samples/two-interfaces/policy b/Shorewall/Samples/two-interfaces/policy index 849e1c9e4..adb5020d2 100644 --- a/Shorewall/Samples/two-interfaces/policy +++ b/Shorewall/Samples/two-interfaces/policy @@ -11,10 +11,10 @@ #------------------------------------------------------------------------------ # For information about entries in this file, type "man shorewall-policy" ############################################################################### -#SOURCE DEST POLICY LOG LEVEL LIMIT:BURST +#SOURCE DEST POLICY LOGLEVEL RATE CONNLIMIT -loc net ACCEPT -net all DROP $LOG_LEVEL -# THE FOLLOWING POLICY MUST BE LAST -all all REJECT $LOG_LEVEL +loc net ACCEPT +net all DROP $LOG_LEVEL +# THE FOLOWING POLICY MUST BE LAST +all all REJECT $LOG_LEVEL diff --git a/Shorewall/configfiles/policy b/Shorewall/configfiles/policy index 8e9d0325c..541a815dc 100644 --- a/Shorewall/configfiles/policy +++ b/Shorewall/configfiles/policy @@ -7,4 +7,4 @@ # http://www.shorewall.net/manpages/shorewall-policy.html # ############################################################################### -#SOURCE DEST POLICY LOGLEVEL LIMIT CONNLIMIT +#SOURCE DEST POLICY LOGLEVEL RATE CONNLIMIT diff --git a/Shorewall/manpages/shorewall-policy.xml b/Shorewall/manpages/shorewall-policy.xml index 9389dcb9a..523731c37 100644 --- a/Shorewall/manpages/shorewall-policy.xml +++ b/Shorewall/manpages/shorewall-policy.xml @@ -259,7 +259,7 @@ - LOG LEVEL (loglevel) - + LOGLEVEL (loglevel) - [log-level|ULOG|NFLOG] @@ -283,7 +283,7 @@ - BURST:LIMIT (limit) - + RATE (rate) - [-|limit] diff --git a/Shorewall6/Samples6/Universal/policy b/Shorewall6/Samples6/Universal/policy index 0637212fe..adc411919 100644 --- a/Shorewall6/Samples6/Universal/policy +++ b/Shorewall6/Samples6/Universal/policy @@ -7,8 +7,7 @@ # http://www.shorewall.net/manpages/shorewall-policy.html # ############################################################################### -#SOURCE DEST POLICY LOG LIMIT: CONNLIMIT: -# LEVEL BURST MASK +#SOURCE DEST POLICY LOGLEVEL RATE CONNLIMIT fw net ACCEPT net all DROP $LOG_LEVEL diff --git a/Shorewall6/Samples6/one-interface/policy b/Shorewall6/Samples6/one-interface/policy index 4b4760c81..2a4329ba9 100644 --- a/Shorewall6/Samples6/one-interface/policy +++ b/Shorewall6/Samples6/one-interface/policy @@ -11,9 +11,9 @@ #----------------------------------------------------------------------------- # For information about entries in this file, type "man shorewall6-policy" # -############################################################################### -#SOURCE DEST POLICY LOG LEVEL LIMIT:BURST -$FW net ACCEPT -net all DROP $LOG_LEVEL +############################################################################## +#SOURCE DEST POLICY LOGLEVEL RATE CONNLIMIT +$FW net ACCEPT +net all DROP $LOG_LEVEL # The FOLLOWING POLICY MUST BE LAST -all all REJECT $LOG_LEVEL +all all REJECT $LOG_LEVEL diff --git a/Shorewall6/Samples6/three-interfaces/policy b/Shorewall6/Samples6/three-interfaces/policy index 5a24f0802..15079b043 100644 --- a/Shorewall6/Samples6/three-interfaces/policy +++ b/Shorewall6/Samples6/three-interfaces/policy @@ -11,9 +11,9 @@ #------------------------------------------------------------------------------ # For information about entries in this file, type "man shorewall6-policy" ############################################################################### -#SOURCE DEST POLICY LOG LEVEL LIMIT:BURST +#SOURCE DEST POLICY LOGLEVEL RATE CONNLIMIT -loc net ACCEPT -net all DROP $LOG_LEVEL -all all REJECT $LOG_LEVEL +loc net ACCEPT +net all DROP $LOG_LEVEL +all all REJECT $LOG_LEVEL diff --git a/Shorewall6/Samples6/two-interfaces/policy b/Shorewall6/Samples6/two-interfaces/policy index a9068eec3..97310e266 100644 --- a/Shorewall6/Samples6/two-interfaces/policy +++ b/Shorewall6/Samples6/two-interfaces/policy @@ -11,9 +11,9 @@ #------------------------------------------------------------------------------ # For information about entries in this file, type "man shorewall6-policy" ############################################################################### -#SOURCE DEST POLICY LOG LEVEL LIMIT:BURST +#SOURCE DEST POLICY LOGLEVEL RATE CONNLIMIT -loc net ACCEPT -net all DROP $LOG_LEVEL -all all REJECT $LOG_LEVEL +loc net ACCEPT +net all DROP $LOG_LEVEL +all all REJECT $LOG_LEVEL diff --git a/Shorewall6/configfiles/policy b/Shorewall6/configfiles/policy index aee2ff02c..73c9d64a4 100644 --- a/Shorewall6/configfiles/policy +++ b/Shorewall6/configfiles/policy @@ -7,4 +7,4 @@ # http://www.shorewall.net/manpages6/shorewall6-policy.html # ############################################################################### -#SOURCE DEST POLICY LOGLEVEL LIMIT CONNLIMIT +#SOURCE DEST POLICY LOGLEVEL RATE CONNLIMIT diff --git a/Shorewall6/manpages/shorewall6-policy.xml b/Shorewall6/manpages/shorewall6-policy.xml index 97a6b5c91..9dd7a6559 100644 --- a/Shorewall6/manpages/shorewall6-policy.xml +++ b/Shorewall6/manpages/shorewall6-policy.xml @@ -257,7 +257,7 @@ - LOG LEVEL (loglevel) - + LOGLEVEL (loglevel) - [log-level|NFLOG] @@ -281,7 +281,7 @@ - BURST:LIMIT (limit) - + RATE (rate) - [-|limit]