diff --git a/manpages/shorewall-interfaces.xml b/manpages/shorewall-interfaces.xml index e61cc26f4..9efaafc3b 100644 --- a/manpages/shorewall-interfaces.xml +++ b/manpages/shorewall-interfaces.xml @@ -55,7 +55,9 @@ loc eth2 - INTERFACE — - interface + interface[:port] Name of interface. Each interface may be listed only once in @@ -70,6 +72,12 @@ loc eth2 - There is no need to define the loopback interface (lo) in this file. + + (Shorewall-perl only) If a port is + given, then the interface must have been + defined previously with the option. The + OPTIONS column must be empty when a port + is given. @@ -185,6 +193,15 @@ loc eth2 - + + bridge + + + (Shorewall-perl only) Designates the interface as a + bridge. + + + detectnets diff --git a/manpages/shorewall-policy.xml b/manpages/shorewall-policy.xml index 9f5bd943c..4438a164e 100644 --- a/manpages/shorewall-policy.xml +++ b/manpages/shorewall-policy.xml @@ -71,8 +71,10 @@ Destination zone. Must be the name of a zone defined in shorewall-zones(5), $FW or - "all" + url="shorewall-zones.html">shorewall-zones(5), $FW or "all". + If the DEST is a bport zone, then the SOURCE must be "all", another + bport zone associated with the same bridge, or it must be an ipv4 + zone that is associated with only the same bridge. diff --git a/manpages/shorewall-rules.xml b/manpages/shorewall-rules.xml index 859f347b9..54f04515e 100644 --- a/manpages/shorewall-rules.xml +++ b/manpages/shorewall-rules.xml @@ -590,6 +590,12 @@ affected. When all+ is used, intra-zone traffic is affected. + If the DEST zone is a bport zone, + then the SOURCE zone must be + , another bport zone associated with the same + bridge, or it must be an ipv4 zone that is associated with only the + same bridge. + Except when all[+] is specified, the server may be further restricted to a particular network, host or interface by appending diff --git a/manpages/shorewall-zones.xml b/manpages/shorewall-zones.xml index ef36184e9..1f3370c2d 100644 --- a/manpages/shorewall-zones.xml +++ b/manpages/shorewall-zones.xml @@ -107,6 +107,15 @@ c:a,b ipv4 zone. + + + bport (or bport4) + + + (Shorewall-perl only) The zone is associated with one or + more ports on a single bridge. + +