Remove netmap from /etc

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2047 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb

Lrp2/etc/netmap

@@ -1,38 +0,0 @@
-##############################################################################
-#
-# Shorewall 2.2  -- Network Mapping Table
-#
-# /etc/shorewall/netmap
-#
-#	This file is used to map addresses in one network to corresponding
-#	addresses in a second network.
-#
-#	WARNING: To use this file, your kernel and iptables must have
-#		 NETMAP support included.
-#
-# Columns must be separated by white space and are:
-#
-#	TYPE	        Must be DNAT or SNAT.
-#
-#			If DNAT, traffic entering INTERFACE and addressed to
-#			NET1 has it's destination address rewritten to the
-#			corresponding address in NET2.
-#
-#			If SNAT, traffic leaving INTERFACE with a source
-#			address in NET1 has it's source address rewritten to
-#			the corresponding address in NET2.
-#			
-#	NET1		Network in CIDR format (e.g., 192.168.1.0/24)
-#
-#	INTERFACE	The name of a network interface. The interface must
-#			be defined in /etc/shorewall/interfaces.
-#
-#	NET2		Network in CIDR format
-#
-# See http://shorewall.net/netmap.html for an example and usage
-# information.
-#
-##############################################################################
-#TYPE	NET1			INTERFACE	NET2
-#
-#LAST LINE -- ADD YOUR ENTRIES ABOVE THIS LINE -- DO NOT REMOVE

Lrp2/etc/shorewall/interfaces

@@ -167,6 +167,8 @@
 #			detectnets   - Automatically taylors the zone named
 #				       in the ZONE column to include only those
 #				       hosts routed through the interface.
+#			upnp         - Incoming requests from this interface may
+#				       be remapped via UPNP (upnpd).
 #
 #		        WARNING: DO NOT SET THE detectnets OPTION ON YOUR
 #			         INTERNET INTERFACE.

Lrp2/etc/shorewall/rules

@@ -188,14 +188,20 @@
 #			contain the port number on the firewall that the
 #			request should be redirected to.
 #
-#	PROTO		Protocol - Must be "tcp", "udp", "icmp", a number, or
+#	PROTO		Protocol - Must be "tcp", "udp", "icmp", "ipp2p", 
-#			"all".
+#			a number, or "all". "ipp2p" requires ipp2p match
+#			support in your kernel and iptables.
 #
 #	DEST PORT(S)    Destination Ports. A comma-separated list of Port
 #			names (from /etc/services), port numbers or port
 #			ranges; if the protocol is "icmp", this column is
 #			interpreted as the destination icmp-type(s).
 #
+#			If the protocol is ipp2p, this column is interpreted
+#			as an ipp2p option without the leading "--" (example "bit"
+#			for bit-torrent). If no port is given, "ipp2p" is
+#			assumed.
+#
 #			A port range is expressed as <low port>:<high port>.
 #
 #			This column is ignored if PROTOCOL = all but must be

Lrp2/etc/shorewall/shorewall.conf

@@ -1,5 +1,5 @@
 ##############################################################################
-# /shorewall/shorewall.conf V2.2 - Change the following variables to
+#  /etc/shorewall/shorewall.conf V2.2 - Change the following variables to
 #  match your setup
 #
 #  This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
@@ -23,6 +23,11 @@ STARTUP_ENABLED=No
 # to syslog (8) the importance of a message and a number of parameters
 # in this file have log levels as their value.
 #
+# These levels are defined by syslog and are used to determine the destination
+# of the messages through entries in /etc/syslog.conf (5). The syslog
+# documentation refers to these as "priorities"; Netfilter calls them "levels"
+# and Shorewall also uses that term.  
+#
 # Valid levels are:
 #
 #	7	debug
@@ -44,8 +49,10 @@ STARTUP_ENABLED=No
 # specify a log level of ULOG (must be all caps). Rather than log its
 # messages to syslogd, Shorewall will direct netfilter to log the messages
 # via the ULOG target which will send them to a process called 'ulogd'.
-# ulogd is available from http://www.gnumonks.org/projects/ulogd and can be
+# ulogd is available with most Linux distributions (although it probably isn't
-# configured to log all Shorewall message to their own log file
+# installed by default). Ulogd is also available from
+# http://www.gnumonks.org/projects/ulogd and can be configured to log all
+# Shorewall message to their own log file
 ################################################################################
 #
 # LOG FILE LOCATION
@@ -544,7 +551,7 @@ MUTEX_TIMEOUT=60
 # A packet is said to be NEW if it is not part of or related to an already
 # established connection.
 #
-# The NETNOTSYN option determines the handling of non-SYN packets (those with
+# The NEWNOTSYN option determines the handling of non-SYN packets (those with
 # SYN off or with ACK or RST on) that are not associated with an already
 # established connection.
 # 
@@ -692,7 +699,7 @@ DYNAMIC_ZONES=No
 # USE PKTTYPE MATCH 
 #
 # Some users have reported problems with the PKTTYPE match extension not being
-# able to patch certail broadcast packets. If you set PKTTYPE=No then Shorewall
+# able to match certain broadcast packets. If you set PKTTYPE=No then Shorewall
 # will use IP addresses to detect broadcasts rather than pkttype. If not given 
 # or if given as empty (PKTTYPE="") then PKTTYPE=Yes is assumed.