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

Update docs for IPP2P change

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9262 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2009-01-09 19:33:37 +00:00
parent 13748eb0e7
commit cf1d6749f1
2 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/IPP2P.xml
View File

@ -83,21 +83,21 @@
<programlisting><command>iptables -m ipp2p --help</command></programlisting> <programlisting><command>iptables -m ipp2p --help</command></programlisting>
<para>You must not include the leading "--" on the option; Shorewall will <para>You must not include the leading "--" on the option(s); Shorewall
supply those characters for you. If you do not include an option will supply those characters for you. If you do not include an option
then:</para> then:</para>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para>Shorewall-shell and Shorewall-perl up through 4.2.4 will assume <para>Shorewall-shell and Shorewall-perl up through 4.2.4 will assume
"ipp2p". Note that the xtables version of IPP2P does not support this "ipp2p". Note that the xtables version of IPP2P no longer supports
option.</para> that option.</para>
</listitem> </listitem>
<listitem> <listitem>
<para>Shorewall-perl 4.2.5 and later will assume "ipp2p" if that <para>Shorewall-perl 4.2.5 and later will assume "ipp2p" if that
option is supported by the installed iptables/Netfilter. Otherwise, it option is supported by the installed iptables/Netfilter. Otherwise,
will assume "edk,kazza,gnu,dc"</para> Shorewall-perl will assume "edk,kazza,gnu,dc"</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>

38
docs/traffic_shaping.xml
View File

@ -129,8 +129,8 @@
HTB allows you to define a set of classes, and you can put the traffic you HTB allows you to define a set of classes, and you can put the traffic you
want into these classes. You can define minimum and maximum bandwidth want into these classes. You can define minimum and maximum bandwidth
settings for those classes and order them hierarchically (the less settings for those classes and order them hierarchically (the less
prioritized classes only get bandwidth if the more important have what they prioritized classes only get bandwidth if the more important have what
need). Shorewall builtin traffic shaping allows you to define these they need). Shorewall builtin traffic shaping allows you to define these
classes (and their bandwidth limits), and it uses SFQ inside these classes classes (and their bandwidth limits), and it uses SFQ inside these classes
to make sure, that different data streams are handled equally.</para> to make sure, that different data streams are handled equally.</para>
@ -161,16 +161,15 @@
any).</para> any).</para>
<para>The reason why queuing is bad in these cases is, that you might <para>The reason why queuing is bad in these cases is, that you might
have packets which need to be prioritized over others, e.g. VoIP or ssh. have packets which need to be prioritized over others, e.g. VoIP or
For this type of connections it is important that packets arrive in a ssh. For this type of connections it is important that packets arrive
certain amount of time. For others like HTTP downloads, it does not in a certain amount of time. For others like HTTP downloads, it does
really matter if it takes a few seconds more.</para> not really matter if it takes a few seconds more.</para>
<para>If you have a large queue on the other side and the router there <para>If you have a large queue on the other side and the router there
does not care about QoS or the QoS bits are not set properly, your does not care about QoS or the QoS bits are not set properly, your
important packets will go into the same queue as your less important packets will go into the same queue as your less time
time critical download packets which will result in a large critical download packets which will result in a large delay.</para>
delay.</para>
</blockquote></para> </blockquote></para>
<para><emphasis role="bold">If you are running Shorewall-perl 4.1.6 or <para><emphasis role="bold">If you are running Shorewall-perl 4.1.6 or
@ -488,9 +487,9 @@ 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.
You define these marks in the tcrules file, marking the traffic you You define these marks in the tcrules file, marking the traffic you
want to go into the queuing classes defined in here. You can use want to go into the queuing classes defined in here. You can use the
the same marks for different Interfaces. You must specify "-' in same marks for different Interfaces. You must specify "-' in this
this column if the device specified in the INTERFACE column has the column if the device specified in the INTERFACE column has the
<emphasis role="bold">classify</emphasis> option in <emphasis role="bold">classify</emphasis> option in
<filename>/etc/shorewall/tcdevices</filename>.</para> <filename>/etc/shorewall/tcdevices</filename>.</para>
</listitem> </listitem>
@ -748,9 +747,9 @@ ppp0 6000kbit 500kbit</programlisting>
addresses and/or subnets. If your kernel and iptables include addresses and/or subnets. If your kernel and iptables include
iprange match support, IP address ranges are also allowed. List iprange match support, IP address ranges are also allowed. List
elements may also consist of an interface name followed by ":" and elements may also consist of an interface name followed by ":" and
an address (e.g., eth1:192.168.1.0/24). If the MARK column an address (e.g., eth1:192.168.1.0/24). If the MARK column specifies
specifies a classification of the form &lt;major&gt;:&lt;minor&gt; a classification of the form &lt;major&gt;:&lt;minor&gt; then this
then this column may also contain an interface name.</para> column may also contain an interface name.</para>
</listitem> </listitem>
<listitem> <listitem>
@ -767,7 +766,14 @@ ppp0 6000kbit 500kbit</programlisting>
<para>If the protocol is ipp2p, this column is interpreted as an <para>If the protocol is ipp2p, this column is interpreted as an
ipp2p option without the leading "--" (example "bit" for ipp2p option without the leading "--" (example "bit" for
bit-torrent). If no PORT is given, "ipp2p" is assumed.</para> bit-torrent). If no PORT is given, "ipp2p" is assumed. Note that the
xtables-addons version of IPP2P does not support the "ipp2p" option;
to use that version of IPP2P with Shorewall-shell or with
Shorewall-perl 4.2.4 or earlier, you must specify an option other
than "ipp2p". Shorewall-perl 4.2.5 and later support a
comma-separated list of IPP2P options in this column; if the column
is empty or contains "ipp2p", then those versions of Shorewall-perl
will substitute "edk,kazaa,gnu,dc".</para>
<para>This column is ignored if PROTOCOL = all but must be entered <para>This column is ignored if PROTOCOL = all but must be entered
if any of the following field is supplied. In that case, it is if any of the following field is supplied. In that case, it is