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

Update references to WIDE_TC_MARKS and HIGH_ROUTE_MARKS

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-11-20 08:45:47 -08:00
parent e5a6387695
commit 88a883da71
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/MultiISP.xml
View File

@ -171,13 +171,15 @@
<listitem> <listitem>
<para>You may not use the SAVE or RESTORE options unless you also <para>You may not use the SAVE or RESTORE options unless you also
set HIGH_ROUTE_MARKS=Yes in set HIGH_ROUTE_MARKS=Yes (PROVIDER_OFFSET &gt; 0 with Shorewall
4.4.26 and later) in
<filename>/etc/shorewall/shorewall.conf</filename>.</para> <filename>/etc/shorewall/shorewall.conf</filename>.</para>
</listitem> </listitem>
<listitem> <listitem>
<para>You may not use connection marking unless you also set <para>You may not use connection marking unless you also set
HIGH_ROUTE_MARKS=Yes in HIGH_ROUTE_MARKS=Yes (PROVIDER_OFFSET &gt; 0 with Shorewall 4.4.26
and later) in
<filename>/etc/shorewall/shorewall.conf</filename>.</para> <filename>/etc/shorewall/shorewall.conf</filename>.</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
@ -226,7 +228,8 @@
value and will restore the packet mark in the PREROUTING CHAIN. value and will restore the packet mark in the PREROUTING CHAIN.
Mark values must be in the range 1-255.</para> Mark values must be in the range 1-255.</para>
<para>Alternatively, you may set HIGH_ROUTE_MARKS=Yes in <para>Alternatively, you may set HIGH_ROUTE_MARKS=Yes
(PROVIDER_OFFSET &gt; 0 with Shorewall 4.4.26 and later) in
<filename>/etc/shorewall/shorewall.conf</filename>. This allows <filename>/etc/shorewall/shorewall.conf</filename>. This allows
you to:</para> you to:</para>

27
docs/traffic_shaping.xml
View File

@ -187,10 +187,12 @@
<filename>/etc/shorewall/tcrules</filename> file.</para> <filename>/etc/shorewall/tcrules</filename> file.</para>
<note> <note>
<para>In Shorewall 4.5.0, WIDE_TC_MARKS was superseded by TC_BITS <para>In Shorewall 4.4.26, WIDE_TC_MARKS was superseded by TC_BITS
which specifies the width in bits of the traffic shaping mark field. which specifies the width in bits of the traffic shaping mark field.
The default is based on the setting of WIDE_TC_MARKS so as to The default is based on the setting of WIDE_TC_MARKS so as to
provide upward compatibility.</para> provide upward compatibility. See the <ulink
url="PacketMarking.html#Values">Packet Marking using
/etc/shorewall/tcrules</ulink> article.</para>
</note> </note>
</listitem> </listitem>
</orderedlist> </orderedlist>
@ -489,7 +491,7 @@ ppp0 6000kbit 500kbit</programlisting>
<listitem> <listitem>
<para>MARK - The mark value which is an integer in the range 1-255 <para>MARK - The mark value which is an integer in the range 1-255
(1-16383 if you set WIDE_TC_MARKS=Yes in <ulink (1-16383 if you set WIDE_TC_MARKS=Yes or set TC_BITS=14 in <ulink
url="manpages/shorewall.conf.html">shorewall.conf</ulink> (5) ). You url="manpages/shorewall.conf.html">shorewall.conf</ulink> (5) ). You
define these marks in the tcrules file, marking the traffic you want define these marks in the tcrules file, marking the traffic you want
to go into the queuing classes defined in here. You can use the same to go into the queuing classes defined in here. You can use the same
@ -829,12 +831,12 @@ ppp0 6000kbit 500kbit</programlisting>
<listitem> <listitem>
<para>MARK or CLASSIFY - MARK specifies the mark value is to be <para>MARK or CLASSIFY - MARK specifies the mark value is to be
assigned in case of a match. This is an integer in the range 1-255 assigned in case of a match. This is an integer in the range 1-255
(1-16383 if you set WIDE_TC_MARKS=Yes in <ulink (1-16383 if you set WIDE_TC_MARKS=Yes or TC_BITS=14 in <ulink
url="manpages/shorewall.conf.html">shorewall.conf</ulink> (5) url="manpages/shorewall.conf.html">shorewall.conf</ulink> (5)
).</para> ).</para>
<note> <note>
<para>In Shorewall 4.5.0, WIDE_TC_MARKS was superseded by TC_BITS <para>In Shorewall 4.4.26, WIDE_TC_MARKS was superseded by TC_BITS
which specifies the width in bits of the traffic shaping mark which specifies the width in bits of the traffic shaping mark
field. The default is based on the setting of WIDE_TC_MARKS so as field. The default is based on the setting of WIDE_TC_MARKS so as
to provide upward compatibility.</para> to provide upward compatibility.</para>
@ -950,12 +952,13 @@ ppp0 6000kbit 500kbit</programlisting>
<orderedlist> <orderedlist>
<listitem> <listitem>
<para>Constructed by Shorewall. The method of construction <para>Constructed by Shorewall. The method of construction
depends on the setting of WIDE_TC_MARKS (<ulink depends on the setting of WIDE_TC_MARKS (TC_BITS in shorewall
4.4.26 and later) in (<ulink
url="manpages/shorewall.conf.html">shorewall.conf</ulink> url="manpages/shorewall.conf.html">shorewall.conf</ulink>
(5)).</para> (5)).</para>
<para>When WIDE_TC_MARKS=No (the default), the &lt;minor&gt; <para>When WIDE_TC_MARKS=No (the default) or TC_BITS &gt; 14,
class is:</para> the &lt;minor&gt; class is:</para>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
@ -967,8 +970,9 @@ ppp0 6000kbit 500kbit</programlisting>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
<para>When WIDE_TC_MARKS=Yes, the &lt;minor&gt; class is <para>When WIDE_TC_MARKS=Yes (TC_BITS &gt;= 14), the
assigned sequentially beginning with 2.</para> &lt;minor&gt; class is assigned sequentially beginning with
2.</para>
</listitem> </listitem>
<listitem> <listitem>
@ -1518,7 +1522,8 @@ IPMARK(src,0xff,0x10100):F 192.168.1.0/29 eth0</programlisting>
assigned sequentially beginning with 2. The WIDE_TC_MARKS option in assigned sequentially beginning with 2. The WIDE_TC_MARKS option in
<filename>shorewall.conf</filename> selects which construction to use. <filename>shorewall.conf</filename> selects which construction to use.
WIDE_TC_MARKS=No (the default) produces pre-Shorewall 4.4 behavior. WIDE_TC_MARKS=No (the default) produces pre-Shorewall 4.4 behavior.
WIDE_TC_MARKS=Yes produces the new behavior.</para> WIDE_TC_MARKS=Yes (TC_BITS &gt;= 14 in Shorewall 4.4.26 and later)
produces the new behavior.</para>
</section> </section>
<section id="Real"> <section id="Real">