From 0cc819f50fccade43b3033b75a24eef6bb35ec70 Mon Sep 17 00:00:00 2001 From: teastep Date: Sat, 10 Jan 2009 17:35:01 +0000 Subject: [PATCH] Remove some anachronisms from the IPP2P doc git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9265 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- docs/IPP2P.xml | 45 ++++++++++++++------------------------------- 1 file changed, 14 insertions(+), 31 deletions(-) diff --git a/docs/IPP2P.xml b/docs/IPP2P.xml index dd4c243ae..db4be5e45 100644 --- a/docs/IPP2P.xml +++ b/docs/IPP2P.xml @@ -50,11 +50,11 @@ Shorewall versions 2.2.0 and later include support for the ipp2p match facility. This is a departure from my usual policy in that the ipp2p - match facility is included in Patch-O-Matic-ENG and is unlikely to ever be - included in the kernel.org source tree. Questions about how to install the - patch or how to build your kernel and/or iptables should not be posted on - the Shorewall mailing lists but should rather be referred to the Netfilter - Mailing List. + match facility is included in xtables-addons and is unlikely to ever be + included in the kernel.org source tree. Questions about how to install + xtables-addons or how to build your kernel and/or iptables should not be + posted on the Shorewall mailing lists but should rather be referred to the + Netfilter Mailing List.
@@ -71,15 +71,16 @@ url="Accounting.html">/etc/shorewall/accounting /etc/shorewall/rules (Recommend - that you place the rules in the ESTABLISHED section of that - file). + url="Shorewall_and_Routing.html">/etc/shorewall/rules (Note + Recommend. But if you insist, then you should place the rules in the + ESTABLISHED section of that file). When the PROTO or PROTOCOL column contains "ipp2p" then the DEST PORT(S) or PORT(S) column may contain a recognized ipp2p option - (Shorewall-perl 4.2.5 and later accepts a list of options); for a list of - the options and their meaning, at a root prompt type: + (Shorewall-perl 4.2.5 and later accepts a comma-separated list of + options); for a list of the options and their meaning, at a root prompt + type: iptables -m ipp2p --help @@ -90,8 +91,8 @@ Shorewall-shell and Shorewall-perl up through 4.2.4 will assume - "ipp2p". Note that the xtables version of IPP2P no longer supports - that option. + "ipp2p". Note that the xtables-addons version of IPP2P no longer + supports that option. @@ -190,25 +191,7 @@ tcp 6 269712 ESTABLISHED src=192.168.3.8 dst=206.124.146.177 sport=50584 dp Rule 05# classifies the packet to traffic shaping class 1:12 if - it is going out of eth0 and has mark value 1 - There are two ways that Netfilter/iptables can classify - traffic. It can be classified directly (which is what this example - does) by specifying a classid of the form - <number>:<number> in the MARK column. That is the - preferred method. A classid is specified when a traffic shaping - class is defined. tc4shorewall assigns a classid of <device - number>:1<mark value>. The first device in - /etc/shorewall/tcdevices is device number 1, - the second is device number 2, and so on. For the first device, - mark value 1 is classid 1:11, mark value 22 is classid 1:122, - etc.. They may also be classified using an fwmark - classifier which causes the traffic shaping code to - classify the traffic based in the packet mark value. That is done - by the traffic shaping solution using the tc filter - add command. The built-in tc4shorewall shaper uses this - command so if you are using the built-in traffic shaping solution, - you may use either method. - . + it is going out of eth0 and has mark value 1.