diff --git a/Shorewall/Perl/Shorewall/Chains.pm b/Shorewall/Perl/Shorewall/Chains.pm index d2a17ffc9..b51d0783f 100644 --- a/Shorewall/Perl/Shorewall/Chains.pm +++ b/Shorewall/Perl/Shorewall/Chains.pm @@ -5190,7 +5190,7 @@ sub do_time( $ ) { $result .= "--monthday $days "; } elsif ( $element =~ /^(datestart|datestop)=(\d{4}(-\d{2}(-\d{2}(T\d{1,2}(:\d{1,2}){0,2})?)?)?)$/ ) { $result .= "--$1 $2 "; - } elsif ( $element =~ /^(utc|localtz|kerneltz)$/ ) { + } elsif ( $element =~ /^(utc|localtz|kerneltz|contiguous)$/ ) { $result .= "--$1 "; } else { fatal_error "Invalid time element ($element)"; diff --git a/Shorewall/manpages/shorewall-mangle.xml b/Shorewall/manpages/shorewall-mangle.xml index ccf2b10fb..c5df54f9f 100644 --- a/Shorewall/manpages/shorewall-mangle.xml +++ b/Shorewall/manpages/shorewall-mangle.xml @@ -1255,6 +1255,17 @@ Normal-Service => 0x00 + + contiguous + + + Added in Shoreawll 5.0.12. When timestop is smaller than timestart value, match this as a single + time period instead distinct intervals. + + + utc diff --git a/Shorewall/manpages/shorewall-rules.xml b/Shorewall/manpages/shorewall-rules.xml index 8312cac7c..9128a7db6 100644 --- a/Shorewall/manpages/shorewall-rules.xml +++ b/Shorewall/manpages/shorewall-rules.xml @@ -595,8 +595,7 @@ Added in Shorewall 4.5.9.3. Queues matching packets to a back end logging daemon via a netlink socket then continues to the next rule. See http://www.shorewall.net/shorewall_logging.html. - + url="/shorewall.logging.html">http://www.shorewall.net/shorewall_logging.html. The nflog-parameters are a comma-separated list of up to 3 numbers: @@ -1683,6 +1682,17 @@ + + contiguous + + + Added in Shoreawll 5.0.12. When timestop is smaller than timestart value, match this as a single + time period instead distinct intervals. + + + utc diff --git a/Shorewall6/manpages/shorewall6-mangle.xml b/Shorewall6/manpages/shorewall6-mangle.xml index 2cc852858..07d198173 100644 --- a/Shorewall6/manpages/shorewall6-mangle.xml +++ b/Shorewall6/manpages/shorewall6-mangle.xml @@ -1331,6 +1331,17 @@ Normal-Service => 0x00 + + contiguous + + + Added in Shoreawll 5.0.12. When timestop is smaller than timestart value, match this as a single + time period instead distinct intervals. + + + utc diff --git a/Shorewall6/manpages/shorewall6-rules.xml b/Shorewall6/manpages/shorewall6-rules.xml index e6a35ba56..c09dd6f9e 100644 --- a/Shorewall6/manpages/shorewall6-rules.xml +++ b/Shorewall6/manpages/shorewall6-rules.xml @@ -1547,6 +1547,17 @@ + + contiguous + + + Added in Shoreawll 5.0.12. When timestop is smaller than timestart value, match this as a single + time period instead distinct intervals. + + + utc