extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-01-11 16:18:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Correct documentation WRT ';' vs. ';;'

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2018-02-12 19:11:01 -08:00
parent 24e21e730e
commit 3402b1efb6
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Shorewall/manpages/shorewall-mangle.xml
View File

@ -374,7 +374,8 @@ DIVERTHA - - tcp</programlisting>
<listitem> <listitem>
<para>Allows you to place your own ip[6]tables matches at the <para>Allows you to place your own ip[6]tables matches at the
end of the line following a semicolon (";"). If an end of the line following a semicolon (";") (deprecated) or
two semicolons (";;") (preferred since Shoreall 5.0.0). If an
<replaceable>action</replaceable> is specified, the compiler <replaceable>action</replaceable> is specified, the compiler
proceeds as if that <replaceable>action</replaceable> had been proceeds as if that <replaceable>action</replaceable> had been
specified in this column. If no action is specified, then you specified in this column. If no action is specified, then you
@ -391,21 +392,15 @@ DIVERTHA - - tcp</programlisting>
<programlisting>2:P eth0 - tcp 22 <programlisting>2:P eth0 - tcp 22
INLINE(MARK(2)):P eth0 - tcp 22 INLINE(MARK(2)):P eth0 - tcp 22
INLINE(MARK(2)):P eth0 - ; -p tcp INLINE(MARK(2)):P eth0 - ;; -p tcp
INLINE eth0 - tcp 22 ; -j MARK --set-mark 2 INLINE eth0 - tcp 22 ;; -j MARK --set-mark 2
INLINE eth0 - ; -p tcp -j MARK --set-mark 2 INLINE eth0 - ;; -p tcp -j MARK --set-mark 2
</programlisting> </programlisting>
<para>If INLINE_MATCHES=Yes in <ulink <para>If INLINE_MATCHES=Yes in <ulink
url="/manpages/shorewall.conf.html">shorewall6.conf(5)</ulink> url="/manpages/shorewall.conf.html">shorewall6.conf(5)</ulink>
then the third rule above can be specified as follows:</para> then the third rule above can be specified as follows:</para>
<programlisting>MARK(2):P eth0 - ; -p tcp</programlisting>
<para>Beginning with Shorewall 5.0.0, the rule may also be
written this way, irrespective of the setting of
INLINE_MATCHES:</para>
<programlisting>MARK(2):P eth0 - ;; -p tcp</programlisting> <programlisting>MARK(2):P eth0 - ;; -p tcp</programlisting>
</listitem> </listitem>
</varlistentry> </varlistentry>

2
Shorewall/manpages/shorewall-masq.xml
View File

@ -700,7 +700,7 @@
<programlisting>/etc/shorewall/masq: <programlisting>/etc/shorewall/masq:
#INTERFACE SOURCE ADDRESS #INTERFACE SOURCE ADDRESS
INLINE(eth1) 0.0.0.0/0 70.90.191.121 ; -m statistic --mode random --probability 0.50 INLINE(eth1) 0.0.0.0/0 70.90.191.121 ;; -m statistic --mode random --probability 0.50
eth1 0.0.0.0/0 70.90.191.123 eth1 0.0.0.0/0 70.90.191.123
</programlisting> </programlisting>

5
Shorewall/manpages/shorewall-rules.xml
View File

@ -461,7 +461,8 @@
<listitem> <listitem>
<para>Added in Shorewall 4.5.16. This action allows you to <para>Added in Shorewall 4.5.16. This action allows you to
construct most of the rule yourself using iptables syntax. The construct most of the rule yourself using iptables syntax. The
part that you specify must follow a semicolon (';') and is part that you specify must follow a semicolon (';')
(deprecated) or two semicolons(';;') (preferred) and is
completely free-form. If the target of the rule (the part completely free-form. If the target of the rule (the part
following 'j') is something that Shorewall supports in the following 'j') is something that Shorewall supports in the
ACTION column, then you may enclose it in parentheses (e.g., ACTION column, then you may enclose it in parentheses (e.g.,
@ -489,7 +490,7 @@
necessarily be at the end of the generated rule. For necessarily be at the end of the generated rule. For
example, if addresses are specified in the SOURCE and/or example, if addresses are specified in the SOURCE and/or
DEST columns, their generated matches will appear after DEST columns, their generated matches will appear after
those specified using ';'.</para> those specified using ';;' (or ';').</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
</listitem> </listitem>