extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-01-08 22:58:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate the old mark layout options.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-11-19 17:14:05 -08:00
parent 9d56fcab89
commit 86c51f24d9
12 changed files with 12 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Samples/Universal/shorewall.conf
View File

@ -136,8 +136,6 @@ FORWARD_CLEAR_MARK=
IMPLICIT_CONTINUE=No IMPLICIT_CONTINUE=No
HIGH_ROUTE_MARKS=No
IP_FORWARDING=On IP_FORWARDING=On
KEEP_RT_TABLES=No KEEP_RT_TABLES=No
@ -188,8 +186,6 @@ TRACK_PROVIDERS=Yes
USE_DEFAULT_RT=No USE_DEFAULT_RT=No
WIDE_TC_MARKS=Yes
ZONE2ZONE=2 ZONE2ZONE=2
############################################################################### ###############################################################################

4
Samples/one-interface/shorewall.conf
View File

@ -147,8 +147,6 @@ FORWARD_CLEAR_MARK=
IMPLICIT_CONTINUE=No IMPLICIT_CONTINUE=No
HIGH_ROUTE_MARKS=No
IP_FORWARDING=Off IP_FORWARDING=Off
KEEP_RT_TABLES=No KEEP_RT_TABLES=No
@ -199,8 +197,6 @@ TRACK_PROVIDERS=Yes
USE_DEFAULT_RT=No USE_DEFAULT_RT=No
WIDE_TC_MARKS=Yes
ZONE2ZONE=2 ZONE2ZONE=2
############################################################################### ###############################################################################

4
Samples/three-interfaces/shorewall.conf
View File

@ -145,8 +145,6 @@ FORWARD_CLEAR_MARK=
IMPLICIT_CONTINUE=No IMPLICIT_CONTINUE=No
HIGH_ROUTE_MARKS=No
IP_FORWARDING=On IP_FORWARDING=On
KEEP_RT_TABLES=No KEEP_RT_TABLES=No
@ -197,8 +195,6 @@ TRACK_PROVIDERS=Yes
USE_DEFAULT_RT=No USE_DEFAULT_RT=No
WIDE_TC_MARKS=Yes
ZONE2ZONE=2 ZONE2ZONE=2
############################################################################### ###############################################################################

4
Samples/two-interfaces/shorewall.conf
View File

@ -148,8 +148,6 @@ FORWARD_CLEAR_MARK=
IMPLICIT_CONTINUE=No IMPLICIT_CONTINUE=No
HIGH_ROUTE_MARKS=No
IP_FORWARDING=On IP_FORWARDING=On
KEEP_RT_TABLES=No KEEP_RT_TABLES=No
@ -200,8 +198,6 @@ TRACK_PROVIDERS=Yes
USE_DEFAULT_RT=No USE_DEFAULT_RT=No
WIDE_TC_MARKS=Yes
ZONE2ZONE=2 ZONE2ZONE=2
############################################################################### ###############################################################################

4
Samples6/Universal/shorewall6.conf
View File

@ -125,8 +125,6 @@ FASTACCEPT=Yes
FORWARD_CLEAR_MARK= FORWARD_CLEAR_MARK=
HIGH_ROUTE_MARKS=No
IMPLICIT_CONTINUE=No IMPLICIT_CONTINUE=No
IP_FORWARDING=Off IP_FORWARDING=Off
@ -165,8 +163,6 @@ TRACK_PROVIDERS=Yes
USE_DEFAULT_RT=No USE_DEFAULT_RT=No
WIDE_TC_MARKS=Yes
ZONE2ZONE=2 ZONE2ZONE=2
############################################################################### ###############################################################################

4
Samples6/one-interface/shorewall6.conf
View File

@ -125,8 +125,6 @@ FASTACCEPT=No
FORWARD_CLEAR_MARK= FORWARD_CLEAR_MARK=
HIGH_ROUTE_MARKS=No
IMPLICIT_CONTINUE=No IMPLICIT_CONTINUE=No
IP_FORWARDING=Off IP_FORWARDING=Off
@ -165,8 +163,6 @@ TRACK_PROVIDERS=Yes
USE_DEFAULT_RT=No USE_DEFAULT_RT=No
WIDE_TC_MARKS=Yes
ZONE2ZONE=2 ZONE2ZONE=2
############################################################################### ###############################################################################

4
Samples6/three-interfaces/shorewall6.conf
View File

@ -125,8 +125,6 @@ FASTACCEPT=No
FORWARD_CLEAR_MARK= FORWARD_CLEAR_MARK=
HIGH_ROUTE_MARKS=No
IMPLICIT_CONTINUE=No IMPLICIT_CONTINUE=No
IP_FORWARDING=On IP_FORWARDING=On
@ -165,8 +163,6 @@ TRACK_PROVIDERS=Yes
USE_DEFAULT_RT=No USE_DEFAULT_RT=No
WIDE_TC_MARKS=Yes
ZONE2ZONE=2 ZONE2ZONE=2
############################################################################### ###############################################################################

4
Samples6/two-interfaces/shorewall6.conf
View File

@ -125,8 +125,6 @@ FASTACCEPT=No
FORWARD_CLEAR_MARK= FORWARD_CLEAR_MARK=
HIGH_ROUTE_MARKS=No
IMPLICIT_CONTINUE=No IMPLICIT_CONTINUE=No
IP_FORWARDING=On IP_FORWARDING=On
@ -165,8 +163,6 @@ TRACK_PROVIDERS=Yes
USE_DEFAULT_RT=No USE_DEFAULT_RT=No
WIDE_TC_MARKS=Yes
ZONE2ZONE=2 ZONE2ZONE=2
############################################################################### ###############################################################################

4
Shorewall/configfiles/shorewall.conf
View File

@ -136,8 +136,6 @@ FORWARD_CLEAR_MARK=
IMPLICIT_CONTINUE=No IMPLICIT_CONTINUE=No
HIGH_ROUTE_MARKS=No
IP_FORWARDING=On IP_FORWARDING=On
KEEP_RT_TABLES=No KEEP_RT_TABLES=No
@ -188,8 +186,6 @@ TRACK_PROVIDERS=No
USE_DEFAULT_RT=No USE_DEFAULT_RT=No
WIDE_TC_MARKS=No
ZONE2ZONE=2 ZONE2ZONE=2
############################################################################### ###############################################################################

4
Shorewall6/configfiles/shorewall6.conf
View File

@ -125,8 +125,6 @@ FASTACCEPT=No
FORWARD_CLEAR_MARK=Yes FORWARD_CLEAR_MARK=Yes
HIGH_ROUTE_MARKS=No
IMPLICIT_CONTINUE=No IMPLICIT_CONTINUE=No
IP_FORWARDING=Off IP_FORWARDING=Off
@ -165,8 +163,6 @@ TRACK_PROVIDERS=No
USE_DEFAULT_RT=No USE_DEFAULT_RT=No
WIDE_TC_MARKS=No
ZONE2ZONE=2 ZONE2ZONE=2
############################################################################### ###############################################################################

6
manpages/shorewall.conf.xml
View File

@ -674,6 +674,9 @@ net all DROP info</programlisting>then the chain name is 'net2all'
role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term> role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term>
<listitem> <listitem>
<para>Deprecated in Shorewall 4.4.26 in favor of
PROVIDER_OFFSET.</para>
<para>Prior to version 3.2.0, it was not possible to use connection <para>Prior to version 3.2.0, it was not possible to use connection
marking in <ulink marking in <ulink
url="shorewall-tcrules.html">shorewall-tcrules</ulink>(5) if you had url="shorewall-tcrules.html">shorewall-tcrules</ulink>(5) if you had
@ -2112,6 +2115,9 @@ net all DROP info</programlisting>then the chain name is 'net2all'
role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term> role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term>
<listitem> <listitem>
<para>Deprecated in Shorewall 4.4.26 in favor of TC_BITS and
MASK_BITS.</para>
<para>When set to No (the default), traffic shaping marks are 8 <para>When set to No (the default), traffic shaping marks are 8
bytes wide (possible values are 1-255). When WIDE_TC_MARKS=Yes, bytes wide (possible values are 1-255). When WIDE_TC_MARKS=Yes,
traffic shaping marks are 14 bytes wide (values 1-16383). The traffic shaping marks are 14 bytes wide (values 1-16383). The

6
manpages6/shorewall6.conf.xml
View File

@ -583,6 +583,9 @@ net all DROP info</programlisting>then the chain name is 'net2all'
role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term> role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term>
<listitem> <listitem>
<para>Deprecated in Shorewall 4.4.26 in favor of
PROVIDER_OFFSET.</para>
<para>You may set HIGH_ROUTE_MARKS=Yes in to effectively divide the <para>You may set HIGH_ROUTE_MARKS=Yes in to effectively divide the
packet mark and connection mark into two mark fields.</para> packet mark and connection mark into two mark fields.</para>
@ -1821,6 +1824,9 @@ net all DROP info</programlisting>then the chain name is 'net2all'
role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term> role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term>
<listitem> <listitem>
<para>Deprecated in Shorewall 4.4.26 in favor of TC_BITS and
MASK_BITS.</para>
<para>When set to No (the default), traffic shaping marks are 8 <para>When set to No (the default), traffic shaping marks are 8
bytes wide (possible values are 1-255). When WIDE_TC_MARKS=Yes, bytes wide (possible values are 1-255). When WIDE_TC_MARKS=Yes,
traffic shaping marks are 14 bytes wide (values 1-16383). The traffic shaping marks are 14 bytes wide (values 1-16383). The