holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

More TC manpage updates

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-09-14 08:01:08 -07:00
parent a581958042
commit 0400cedc6c
6 changed files with 66 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Shorewall/manpages/shorewall-tcclasses.xml
View File

@ -249,15 +249,30 @@
</blockquote> </blockquote>
<para>For both HTB and HFSC, the <emphasis>priority</emphasis> is <para>For both HTB and HFSC, the <emphasis>priority</emphasis> is
used to calculate the priority of Shorewall-generated classification used to calculate the priority of following Shorewall-generated
filters that refer to the class. The rules for classes with lower classification filters that refer to the class:</para>
numeric priorities will appear before those with higher numeric
priorities.</para>
<para>Beginning with Shorewall 4.5.8, the PRIORITY may be omitted, <itemizedlist>
providing that a priority is specified in the MARK column and with <listitem>
the <emphasis role="bold">tcp-ack</emphasis> and <emphasis <para>Packet MARK</para>
role="bold">tos</emphasis> options.</para> </listitem>
<listitem>
<para><emphasis role="bold">tcp-ack</emphasis> and the <emphasis
role="bold">tos</emphasis> options (see below)</para>
</listitem>
</itemizedlist>
<para> The rules for classes with lower numeric priorities will
appear before those with higher numeric priorities. </para>
<para>Beginning with Shorewall 4.5.8, the PRIORITY may be omitted
from an HFSC class if you do not use the MARK column or the
<emphasis role="bold">tcp-ack</emphasis> or <emphasis
role="bold">tos</emphasis> options. If you use any of those features
and omit the PRIORITY, then you must specify a
<replaceable>priority</replaceable> along with the MARK or
option.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -317,7 +332,7 @@
<para>Aliases for the following TOS octet value and mask <para>Aliases for the following TOS octet value and mask
encodings. TOS encodings of the "TOS byte" have been encodings. TOS encodings of the "TOS byte" have been
deprecated in favor of diffserve classes, but programs like deprecated in favor of diffserve classes, but programs like
ssh, rlogin, and ftp still use them. </para> ssh, rlogin, and ftp still use them.</para>
<para>Beginning with Shorewall 4.5.8, the <para>Beginning with Shorewall 4.5.8, the
<replaceable>tos-name</replaceable> may be followed by a colon <replaceable>tos-name</replaceable> may be followed by a colon

13
Shorewall/manpages/shorewall-tcdevices.xml
View File

@ -180,7 +180,7 @@
<term><emphasis role="bold">OPTIONS</emphasis> - {<emphasis <term><emphasis role="bold">OPTIONS</emphasis> - {<emphasis
role="bold">-</emphasis>|<emphasis role="bold">-</emphasis>|<emphasis
role="bold">{classify</emphasis>|<emphasis role="bold">{classify</emphasis>|<emphasis
role="bold">hfsc</emphasis>|<emphasis role="bold">htb|hfsc</emphasis>|<emphasis
role="bold">linklayer</emphasis>={<emphasis role="bold">linklayer</emphasis>={<emphasis
role="bold">ethernet</emphasis>|<emphasis role="bold">ethernet</emphasis>|<emphasis
role="bold">atm</emphasis>|<emphasis role="bold">atm</emphasis>|<emphasis
@ -197,11 +197,14 @@
marks. You must do all classification using CLASSIFY rules in <ulink marks. You must do all classification using CLASSIFY rules in <ulink
url="shorewall-tcrules.html">shorewall-tcrules</ulink>(5).</para> url="shorewall-tcrules.html">shorewall-tcrules</ulink>(5).</para>
<para><option>htb</option> - Use the <firstterm>Hierarchical Token
Bucket</firstterm> queuing discipline. This is the default.</para>
<para><option>hfsc</option> - Shorewall normally uses the <para><option>hfsc</option> - Shorewall normally uses the
<firstterm>Hierarchical Token Bucket</firstterm> queuing discipline. Hierarchical Token Bucket queuing discipline. When
When <option>hfsc</option> is specified, the <firstterm>Hierarchical <option>hfsc</option> is specified, the <firstterm>Hierarchical Fair
Fair Service Curves</firstterm> discipline is used instead (see Service Curves</firstterm> discipline is used instead (see tc-hfsc
tc-hfsc (7)).</para> (7)).</para>
<para><emphasis role="bold">linklayer</emphasis> - Added in <para><emphasis role="bold">linklayer</emphasis> - Added in
Shorewall 4.5.6. Type of link (ethernet, atm, adsl). When specified, Shorewall 4.5.6. Type of link (ethernet, atm, adsl). When specified,

3
Shorewall/manpages/shorewall-tcfilters.xml
View File

@ -196,8 +196,7 @@
<listitem> <listitem>
<para>Added in Shorewall 4.5.8. Specifies the rule <para>Added in Shorewall 4.5.8. Specifies the rule
<replaceable>priority</replaceable>. If not given, <replaceable>priority</replaceable>. The
<replaceable>priority</replaceable> 10 is assumed. The
<replaceable>priority</replaceable> value must be &gt; 0 and &lt;= <replaceable>priority</replaceable> value must be &gt; 0 and &lt;=
65535.</para> 65535.</para>

32
Shorewall6/manpages/shorewall6-tcclasses.xml
View File

@ -246,16 +246,30 @@
</blockquote> </blockquote>
<para>For both HTB and HFSC, the <emphasis>priority</emphasis> is <para>For both HTB and HFSC, the <emphasis>priority</emphasis> is
used to calculate the priority of Shorewall-generated classification used to calculate the priority of following Shorewall-generated
filters that refer to the class. The rules for classes with lower classification filters that refer to the class:</para>
numeric priorities will appear before those with higher numeric
priorities.</para>
<para>Beginning with Shorewall 4.5.8, the PRIORITY may be omitted, <itemizedlist>
providing that a <replaceable>priority</replaceable> is specified in <listitem>
the MARK column and with the <emphasis <para>Packet MARK</para>
role="bold">tcp-ack</emphasis> and <emphasis </listitem>
role="bold">tos</emphasis> options.</para>
<listitem>
<para><emphasis role="bold">tcp-ack</emphasis> and the <emphasis
role="bold">tos</emphasis> options (see below)</para>
</listitem>
</itemizedlist>
<para>The rules for classes with lower numeric priorities will
appear before those with higher numeric priorities.</para>
<para>Beginning with Shorewall 4.5.8, the PRIORITY may be omitted
from an HFSC class if you do not use the MARK column or the
<emphasis role="bold">tcp-ack</emphasis> or <emphasis
role="bold">tos</emphasis> options. If you use those features and
omit the PRIORITY, then you must specify a
<replaceable>priority</replaceable> along with the MARK or
option.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>

13
Shorewall6/manpages/shorewall6-tcdevices.xml
View File

@ -180,7 +180,7 @@
<varlistentry> <varlistentry>
<term><emphasis role="bold">OPTIONS</emphasis> - {<emphasis <term><emphasis role="bold">OPTIONS</emphasis> - {<emphasis
role="bold">-</emphasis>|<emphasis role="bold">-</emphasis>|<emphasis
role="bold">{classify</emphasis>|<emphasis role="bold">{classify</emphasis>|htb|<emphasis
role="bold">hfsc</emphasis>|<emphasis role="bold">hfsc</emphasis>|<emphasis
role="bold">linklayer</emphasis>={<emphasis role="bold">linklayer</emphasis>={<emphasis
role="bold">ethernet</emphasis>|<emphasis role="bold">ethernet</emphasis>|<emphasis
@ -198,11 +198,14 @@
marks. You must do all classification using CLASSIFY rules in <ulink marks. You must do all classification using CLASSIFY rules in <ulink
url="shorewall-tcrules.html">shorewall-tcrules</ulink>(5).</para> url="shorewall-tcrules.html">shorewall-tcrules</ulink>(5).</para>
<para><option>htb</option> - Use the <firstterm>Hierarchical Token
Bucket</firstterm> queuing discipline. This is the default.</para>
<para><option>hfsc</option> - Shorewall normally uses the <para><option>hfsc</option> - Shorewall normally uses the
<firstterm>Hierarchical Token Bucket</firstterm> queuing discipline. Hierarchical Token Bucket queuing discipline. When
When <option>hfsc</option> is specified, the <firstterm>Hierarchical <option>hfsc</option> is specified, the <firstterm>Hierarchical Fair
Fair Service Curves</firstterm> discipline is used instead(see Service Curves</firstterm> discipline is used instead(see tc-hfsc
tc-hfsc (7)).</para> (7)).</para>
<para><emphasis role="bold">linklayer</emphasis> - Added in <para><emphasis role="bold">linklayer</emphasis> - Added in
Shorewall 4.5.6. Type of link (ethernet, atm, adsl). When specified, Shorewall 4.5.6. Type of link (ethernet, atm, adsl). When specified,

5
Shorewall6/manpages/shorewall6-tcfilters.xml
View File

@ -191,9 +191,8 @@
role="bold">-</emphasis>|<emphasis>number</emphasis>]</term> role="bold">-</emphasis>|<emphasis>number</emphasis>]</term>
<listitem> <listitem>
<para>Added in Shorewall 4.5.8. Specifies the rule priority. If not <para>Added in Shorewall 4.5.8. Specifies the rule priority. The
given, priority 11 is assumed. The priority value must be &gt; 0 and priority value must be &gt; 0 and &lt;= 65535.</para>
&lt;= 65535.</para>
<para>When a <replaceable>priority</replaceable> is not <para>When a <replaceable>priority</replaceable> is not
given:</para> given:</para>