diff --git a/Shorewall-docs2/Shorewall_and_Routing.xml b/Shorewall-docs2/Shorewall_and_Routing.xml
index 230df9061..08c598656 100644
--- a/Shorewall-docs2/Shorewall_and_Routing.xml
+++ b/Shorewall-docs2/Shorewall_and_Routing.xml
@@ -15,7 +15,7 @@
- 2005-05-19
+ 2005-05-20
2005
@@ -260,8 +260,9 @@
- Packet marking for traffic control purposes must be done in
- the FORWARD table.
+ Packet marking for traffic control purposes may not be done
+ in the PREROUTING table for connections involving providers with
+ 'track' specified (see below).
@@ -384,8 +385,11 @@
balance
- The providers that have 'default' specified will get
- outbound traffic load-balanced among them.
+ The providers that have 'balance' specified will get
+ outbound traffic load-balanced among them. Balancing will
+ not be perfect, as it is route based, and routes are
+ cached. This means that routes to often-used sites will
+ always be over the same provider.
@@ -427,6 +431,16 @@ net net DROP
#INTERFACE SUBNET ADDRESS
eth0 eth2 206.124.146.176
eth1 eth2 130.252.99.27
+
+ Now suppose that you want to route all outgoing SMTP traffic
+ through ISP 2. You would make this entry in /etc/shorewall/tcrules (and you would
+ set TC_ENABLED=Yes in /etc/shorewall/shorewall.conf).
+
+ #MARK SOURCE DEST PROTO PORT(S) CLIENT USER TEST
+# PORT(S)
+2 <local network> 0.0.0.0/0 tcp 25
diff --git a/Shorewall-docs2/traffic_shaping.xml b/Shorewall-docs2/traffic_shaping.xml
index cafbf5250..e80f194fc 100644
--- a/Shorewall-docs2/traffic_shaping.xml
+++ b/Shorewall-docs2/traffic_shaping.xml
@@ -15,7 +15,7 @@
- 2005-02-19
+ 2005-05-20
2001-2005
@@ -191,6 +191,14 @@
in the /etc/shorewall/tcrules file.
+
+ If you use providers (in /etc/shorewall/providers) with the
+ 'track' option then there are restrictions about how you can mark
+ packets involving those providers; see the Shorewall Routing documentation
+ for details.
+
+
Columns in the file are as follows: