From 2dd82a9898e1d04a4bede028e4163cd96912f676 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Tue, 1 May 2012 10:28:12 -0700 Subject: [PATCH] Update Multi-ISP documentation Signed-off-by: Tom Eastep --- Shorewall/manpages/shorewall-providers.xml | 3 +- Shorewall6/manpages/shorewall6-providers.xml | 12 +++---- docs/MultiISP.xml | 37 +++++--------------- 3 files changed, 14 insertions(+), 38 deletions(-) diff --git a/Shorewall/manpages/shorewall-providers.xml b/Shorewall/manpages/shorewall-providers.xml index 25952c059..bf4d5be78 100644 --- a/Shorewall/manpages/shorewall-providers.xml +++ b/Shorewall/manpages/shorewall-providers.xml @@ -87,8 +87,7 @@ being zero). Otherwise, the value must be between 1 and 255. Each provider must be assigned a unique mark value. This column may be omitted if you don't use packet marking to direct connections to a - particular provider and you don't specify in - the OPTIONS column. + particular provider. diff --git a/Shorewall6/manpages/shorewall6-providers.xml b/Shorewall6/manpages/shorewall6-providers.xml index c91bc0634..99c3b6f57 100644 --- a/Shorewall6/manpages/shorewall6-providers.xml +++ b/Shorewall6/manpages/shorewall6-providers.xml @@ -87,8 +87,7 @@ of the value being zero). Otherwise, the value must be between 1 and 255. Each provider must be assigned a unique mark value. This column may be omitted if you don't use packet marking to direct connections - to a particular provider and you don't specify - in the OPTIONS column. + to a particular provider. @@ -321,10 +320,9 @@ shorewall6(8), shorewall6-accounting(5), shorewall6-actions(5), shorewall6-blacklist(5), shorewall6-hosts(5), shorewall6-interfaces(5), shorewall6-maclist(5), shoewall6-netmap(5),shorewall6-params(5), - shorewall6-policy(5), shorewall6-rtrules(5), - shorewall6-routestopped(5), shorewall6-rules(5), shorewall6.conf(5), - shorewall6-secmarks(5), shorewall6-tcclasses(5), shorewall6-tcdevices(5), - shorewall6-tcrules(5), shorewall6-tos(5), shorewall6-tunnels(5), - shorewall6-zones(5) + shorewall6-policy(5), shorewall6-rtrules(5), shorewall6-routestopped(5), + shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5), + shorewall6-tcclasses(5), shorewall6-tcdevices(5), shorewall6-tcrules(5), + shorewall6-tos(5), shorewall6-tunnels(5), shorewall6-zones(5) diff --git a/docs/MultiISP.xml b/docs/MultiISP.xml index 02a044095..230b85efd 100644 --- a/docs/MultiISP.xml +++ b/docs/MultiISP.xml @@ -50,7 +50,7 @@ This document describes the Multi-ISP facility in Shorewall 4.5.0 and later. If you are running an + role="bold">Shorewall 4.4.26 and later. If you are running an earlier release, please see the documentation for that release. @@ -251,25 +251,25 @@ - These mark values must be a multiple of 256 in the - range 256-65280 (hex equivalent 0x100 - 0xFF00 with the + With HIGH_ROUTE_MARKS=Yes (PROVIDER_OFFSET=8), these + mark values must be a multiple of 256 in the range + 256-65280 (hex equivalent 0x100 - 0xFF00 with the low-order 8 bits being zero); or Set WIDE_TC_MARKS=Yes in shorewall.conf - (5) and use mark values in the range 0x10000 - - 0xFF0000 with the low-order 16 bits being zero. + (5) (PROVIDER_OFFSET=16), and use mark values in + the range 0x10000 - 0xFF0000 with the low-order 16 bits + being zero. This column may be omitted if you don´t use packet marking - to direct connections to a particular provider and you don´t - specify track in the OPTIONS - column. + to direct connections to a particular provider. @@ -417,27 +417,6 @@ url="FAQ.htm#faq58">FAQ 58. - - - If you specify balance and still find that all - traffic is going out through only one provider, you may - need to install a kernel built with - CONFIG_IP_ROUTE_MULTIPATH_CACHED=n. Several users have - reported that this change has corrected similar - problems. - - The SuSE 10.0 kernel is subject to this problem, and - - a kernel oops may result in this circumstance. - SUSE 10.1 and SLES 10 have - CONFIG_IP_ROUTE_MULTIPATH_CACHED=n set by default. The - source of the problem seems to be an - incompatibility between the LARTC patches and - CONFIG_IP_ROUTE_MULTIPATH_CACHED. -