From 2b7ef0fe32019e14331c2b3b68d455294606ab4f Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Mon, 18 Apr 2016 09:18:48 -0700 Subject: [PATCH] Update the tcclasses manpage to discuss fw mark filter priority - Also correct default priorities for tos= and tcp-ack Signed-off-by: Tom Eastep --- Shorewall/manpages/shorewall-tcclasses.xml | 25 +++++++++++--------- Shorewall6/manpages/shorewall6-tcclasses.xml | 23 ++++++++++-------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/Shorewall/manpages/shorewall-tcclasses.xml b/Shorewall/manpages/shorewall-tcclasses.xml index a53ab2617..90e59f25f 100644 --- a/Shorewall/manpages/shorewall-tcclasses.xml +++ b/Shorewall/manpages/shorewall-tcclasses.xml @@ -156,20 +156,23 @@ MARK - - {-|value} + {-|value[:priority]} The mark value which is an integer in the range 1-255. You set mark values in the shorewall-mangle(5) file, marking the traffic you want to fit in the classes defined in - here. Must be specified as '-' if the classify option is given for the interface in - shorewall-tcdevices(5) - and you are running Shorewall 4.5.5 or earlier. + here. You can use the same marks for different interfaces. - You can use the same marks for different interfaces. + The priority, if specified, is an + integer in the range 1-65535 and determines the relative order in + which the tc mark classification filter for this class is to be + applied to packets being sent on the + interface. Filters are applied in + ascending numerical order. If not supplied, the value is derived + from the class priority (PRIORITY column value below): + (class priority << 8) | 20. @@ -293,7 +296,7 @@ This is the default class for that interface where all traffic should go, that is not classified otherwise. - + You must define class priority << 8) | - 10) is used. + 15) is used. @@ -339,7 +342,7 @@ (":") and a priority. This priority determines the order in which filter rules are processed during packet classification. If not specified, the value - (class priority << 8) | 10) + (class priority << 8) | 15) is used. tos-minimize-delay 0x10/0x10 @@ -372,7 +375,7 @@ (":") and a priority. This priority determines the order in which filter rules are processed during packet classification. If not specified, the value - (class priority << 8) | 20) + (class priority << 8) | 10) is used. diff --git a/Shorewall6/manpages/shorewall6-tcclasses.xml b/Shorewall6/manpages/shorewall6-tcclasses.xml index 013542a3f..29cbc0a5b 100644 --- a/Shorewall6/manpages/shorewall6-tcclasses.xml +++ b/Shorewall6/manpages/shorewall6-tcclasses.xml @@ -152,20 +152,23 @@ MARK - - {-|value} + {-|value[:priority]} The mark value which is an integer in the range 1-255. You set mark values in the shorewall6-mangle(5) + url="/manpages/shorewall-mangle.html">shorewall-mangle(5) file, marking the traffic you want to fit in the classes defined in - here. Must be specified as '-' if the classify option is given for the interface in - shorewall6-tcdevices(5) - and you are running Shorewall 4.5 5 or earlier. + here. You can use the same marks for different interfaces. - You can use the same marks for different interfaces. + The priority, if specified, is an + integer in the range 1-65535 and determines the relative order in + which the tc mark classification filter for this class is to be + applied to packets being sent on the + interface. Filters are applied in + ascending numerical order. If not supplied, the value is derived + from the class priority (PRIORITY column value below): + (class priority << 8) | 20. @@ -314,7 +317,7 @@ priority determines the order in which filter rules are processed during packet classification. If not specified, the value (class priority << 8) | - 10) is used. + 15) is used. @@ -366,7 +369,7 @@ (":") and a priority. This priority determines the order in which filter rules are processed during packet classification. If not specified, the value - (class priority << 8) | 20) + (class priority << 8) | 10) is used.