holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Use simple tables in index; add additional information to simple bridge doc

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4736 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-10-26 14:23:47 +00:00
parent 1bfb09dd6c
commit 0ee37b2024
2 changed files with 90 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
docs/Documentation_Index.xml
View File

@ -68,28 +68,24 @@
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para><ulink url="configuration_file_basics.htm">Configuration File <para><ulink url="configuration_file_basics.htm">Configuration File
Basics</ulink></para> Basics</ulink><blockquote>
<para><informaltable frame="none">
<blockquote>
<para><table frame="none">
<title></title>
<tgroup cols="2"> <tgroup cols="2">
<tbody> <tbody valign="middle">
<row> <row>
<entry><ulink <entry><ulink
url="configuration_file_basics.htm#Comments">Comments in url="configuration_file_basics.htm#Comments">Comments in
configuration files</ulink></entry> configuration files</ulink></entry>
<entry><ulink <entry><ulink
url="configuration_file_basics.htm#Variables">Using Shell url="configuration_file_basics.htm#Variables">Using
Variables</ulink></entry> Shell Variables</ulink></entry>
</row> </row>
<row> <row>
<entry><ulink <entry><ulink
url="configuration_file_basics.htm#COMMENT">Attach Comment url="configuration_file_basics.htm#COMMENT">Attach
to Netfilter Rules</ulink></entry> Comment to Netfilter Rules</ulink></entry>
<entry><ulink <entry><ulink
url="configuration_file_basics.htm#dnsnames">Using DNS url="configuration_file_basics.htm#dnsnames">Using DNS
@ -138,10 +134,8 @@
</row> </row>
</tbody> </tbody>
</tgroup> </tgroup>
</table></para> </informaltable></para>
</blockquote> </blockquote></para>
<para></para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
</section> </section>
@ -153,21 +147,29 @@
Guides. Please review the appropriate guide before trying to use this Guides. Please review the appropriate guide before trying to use this
documentation directly.</para> documentation directly.</para>
<table frame="none"> <informaltable frame="none">
<title>Alphabetical Index</title> <tgroup align="left" cols="3">
<tgroup cols="3">
<tbody> <tbody>
<row> <row>
<entry><ulink url="Kernel2.6.html">2.6 Kernel</ulink></entry> <entry><ulink url="Kernel2.6.html">2.6 Kernel</ulink></entry>
<entry><ulink url="IPSEC-2.6.html">IPSEC using Kernel 2.6 and
Shorewall 2.1 or Later</ulink></entry>
<entry><ulink url="Multiple_Zones.html">Routing on One
Interface</ulink></entry>
</row>
<row>
<entry><ulink url="Accounting.html">Accounting</ulink></entry>
<entry><ulink url="ipsets.html">Ipsets</ulink></entry> <entry><ulink url="ipsets.html">Ipsets</ulink></entry>
<entry><ulink url="samba.htm">Samba</ulink></entry> <entry><ulink url="samba.htm">Samba</ulink></entry>
</row> </row>
<row> <row>
<entry><ulink url="Accounting.html">Accounting</ulink></entry> <entry><ulink url="Actions.html">Actions</ulink></entry>
<entry><ulink url="Shorewall_and_Kazaa.html">Kazaa <entry><ulink url="Shorewall_and_Kazaa.html">Kazaa
Filtering</ulink></entry> Filtering</ulink></entry>
@ -177,7 +179,8 @@
</row> </row>
<row> <row>
<entry><ulink url="Actions.html">Actions</ulink></entry> <entry><ulink url="Shorewall_and_Aliased_Interfaces.html">Aliased
(virtual) Interfaces (e.g., eth0:0)</ulink></entry>
<entry><ulink url="kernel.htm">Kernel <entry><ulink url="kernel.htm">Kernel
Configuration</ulink></entry> Configuration</ulink></entry>
@ -187,8 +190,8 @@
</row> </row>
<row> <row>
<entry><ulink url="Shorewall_and_Aliased_Interfaces.html">Aliased <entry><ulink url="traffic_shaping.htm">Bandwidth
(virtual) Interfaces (e.g., eth0:0)</ulink></entry> Control</ulink></entry>
<entry><ulink url="PortKnocking.html#Limit">Limiting per-IPaddress <entry><ulink url="PortKnocking.html#Limit">Limiting per-IPaddress
Connection Rate</ulink></entry> Connection Rate</ulink></entry>
@ -197,8 +200,8 @@
</row> </row>
<row> <row>
<entry><ulink url="traffic_shaping.htm">Bandwidth <entry><ulink
Control</ulink></entry> url="blacklisting_support.htm">Blacklisting</ulink></entry>
<entry><ulink url="shorewall_logging.html">Logging</ulink></entry> <entry><ulink url="shorewall_logging.html">Logging</ulink></entry>
@ -207,8 +210,8 @@
</row> </row>
<row> <row>
<entry><ulink <entry>Bridge: <ulink url="bridge.html">With physdev match
url="blacklisting_support.htm">Blacklisting</ulink></entry> support</ulink></entry>
<entry><ulink url="Macros.html">Macros</ulink></entry> <entry><ulink url="Macros.html">Macros</ulink></entry>
@ -218,9 +221,8 @@
</row> </row>
<row> <row>
<entry>Bridging/Firewall: <ulink url="bridge.html">With physdev <entry>Bridge: <ulink url="NewBridge.html">Without physdev match
match support</ulink> — <ulink url="NewBridge.html">Without support</ulink></entry>
physdev match support</ulink></entry>
<entry><ulink url="MAC_Validation.html">MAC <entry><ulink url="MAC_Validation.html">MAC
Verification</ulink></entry> Verification</ulink></entry>
@ -230,8 +232,8 @@
</row> </row>
<row> <row>
<entry><ulink url="SimpleBridge.html">Bridge (don't need to <entry>Bridge: <ulink url="SimpleBridge.html">No control of
control traffic through the bridge)</ulink></entry> traffic through the bridge</ulink></entry>
<entry><ulink url="MultiISP.html">Multiple Internet Connections <entry><ulink url="MultiISP.html">Multiple Internet Connections
from a Single Firewall</ulink></entry> from a Single Firewall</ulink></entry>
@ -405,18 +407,8 @@
<entry></entry> <entry></entry>
</row> </row>
<row>
<entry><ulink url="IPSEC-2.6.html">IPSEC using Kernel 2.6 and
Shorewall 2.1 or Later</ulink></entry>
<entry><ulink url="Multiple_Zones.html">Routing on One
Interface</ulink></entry>
<entry></entry>
</row>
</tbody> </tbody>
</tgroup> </tgroup>
</table> </informaltable>
</section> </section>
</article> </article>

7
docs/SimpleBridge.xml
View File

@ -93,6 +93,13 @@
bridge-specific changes are restricted to the bridge-specific changes are restricted to the
<filename>/etc/shorewall/interfaces</filename> file.</para> <filename>/etc/shorewall/interfaces</filename> file.</para>
<para>This example illustrates the bridging of two ethernet devices but
the types of the devices really isn't important. What is shown here would
apply equally to bridging an ethernet device to an <ulink
url="OPENVPN.html">OpenVPN</ulink> tap device (e.g.,
<filename>tap0</filename>) or to a wireless device
(<filename>ath0</filename> or <filename>wlan0</filename>).</para>
<para><filename>/etc/shorewall/interfaces</filename>:</para> <para><filename>/etc/shorewall/interfaces</filename>:</para>
<programlisting>#ZONE INTERFACE BROADCAST OPTIONS <programlisting>#ZONE INTERFACE BROADCAST OPTIONS