diff --git a/Shorewall-docs2/Documentation.xml b/Shorewall-docs2/Documentation.xml
index 3f0cfe8ca..491318294 100644
--- a/Shorewall-docs2/Documentation.xml
+++ b/Shorewall-docs2/Documentation.xml
@@ -15,7 +15,7 @@
- 2004-11-26
+ 2004-12-11
2001-2004
@@ -2582,6 +2582,35 @@ eth0 eth1 206.124.146.176
+
+ DROPINVALID
+
+
+ (Added at version 2.2.0) — Recent 2.6 kernels include code
+ that evaluates TCP packets based on TCP Window analysis. This can
+ cause packets that were previously classified as NEW or ESTABLISHED
+ to be classified as INVALID.
+
+ The new kernel code can be disabled by including this command
+ in your /etc/shorewall/init
+ file:
+
+ echo 1 > /proc/sys/net/ipv4/netfilter/ip_conntrack_tcp_be_liberal
+
+ Additional kernel logging about INVALID TCP packets may be
+ obtained by adding this command to /etc/shorewall/init:
+
+ echo 1 > /proc/sys/net/ipv4/netfilter/ip_conntrack_log_invalid
+
+ Traditionally, Shorewall has dropped INVALID TCP packets
+ early. The DROPINVALID option allows INVALID packets to be passed
+ through the normal rules chains by setting DROPINVALID=No. If not
+ specified or if specified as empty (e.g., DROPINVALID="") then
+ DROPINVALID=Yes is assumed.
+
+
+
LOGALLNEW
diff --git a/Shorewall-docs2/starting_and_stopping_shorewall.xml b/Shorewall-docs2/starting_and_stopping_shorewall.xml
index f1c03b66a..47134e439 100644
--- a/Shorewall-docs2/starting_and_stopping_shorewall.xml
+++ b/Shorewall-docs2/starting_and_stopping_shorewall.xml
@@ -15,7 +15,7 @@
- 2004-11-27
+ 2004-12-11
2004
@@ -367,11 +367,29 @@
add
- shorewall add <interface>[:<bridge
- port>][:<host>] <zone>
+ shorewall add <interface>[:<host-list>] …
+ <zone>
- Adds a host or subnet to a dynamic zone usually used with
- VPN's.
+ A <host-list> is a comma-separated list whose entries
+ are:
+
+
+
+ A host or network address
+
+
+
+ The name of a bridge port
+
+
+
+ The name of a bridge port followed by a colon (":") and a
+ host or network address.
+
+
+
+ Adds an interface (and list of hosts if included) to a dynamic
+ zone usually used with VPN's.
Note that there was no provision in the syntax for specifying
a bridge port prior to Shorewall
@@ -448,11 +466,30 @@
delete
- shorewall delete <interface>[:<bridge
- port>][:<host>] <zone>
+ shorewall delete
+ <interface>[:<host-list>] …
+ <zone>
- Deletes the specified interface (and host if included) from
- the specified zone.
+ A <host-list> is a comma-separated list whose entries
+ are:
+
+
+
+ A host or network address
+
+
+
+ The name of a bridge port
+
+
+
+ The name of a bridge port followed by a colon (":") and a
+ host or network address.
+
+
+
+ Deletes the specified interface (and host list if included)
+ from the specified zone.
Note that there was no provision in the syntax for specifying
a bridge port prior to Shorewall