Reinstate IPv6 DropSmurfs

Signed-off-by: Tom Eastep <teastep@shorewall.net>

Shorewall-core/configure

@@ -195,10 +195,6 @@ elif [ -n "${options[VARDIR]}" ]; then
     fi
 fi
 
-if [ -z "${options[SERVICEDIR]}" ]; then
-    options[SERVICEDIR]="${options[SYSTEMD]}"
-fi
-
 for on in \
     HOST \
     PREFIX \
@@ -213,7 +209,7 @@ for on in \
     INITFILE \
     AUXINITSOURCE \
     AUXINITFILE \
-    SERVICEDIR \
+    SYSTEMD \
     SERVICEFILE \
     SYSCONFFILE \
     SYSCONFDIR \

Shorewall-core/configure.pl

@@ -154,8 +154,6 @@ if ( $options{VARLIB} ) {
     $options{VARDIR} = '${VARLIB}/${PRODUCT}';
 }
 
-$options{SERVICEDIR}=$options{SYSTEMD} unless $options{SERVICEDIR};
-
 for ( qw/ HOST
 	  PREFIX
 	  SHAREDIR
@@ -169,8 +167,8 @@ for ( qw/ HOST
 	  INITFILE
 	  AUXINITSOURCE
 	  AUXINITFILE
-	  SERVICEDIR
-	  SERVICEFILE
+	  SYSTEMD
+          SERVICEFILE
 	  SYSCONFFILE
 	  SYSCONFDIR
 	  SPARSE

Shorewall-core/install.sh

@@ -329,13 +329,9 @@ if [ -n "${SYSCONFDIR}" ]; then
     chmod 755 ${DESTDIR}${SYSCONFDIR}
 fi
 
-if [ -z "${SERVICEDIR}" ]; then
-    SERVICEDIR="$SYSTEMD"
-fi
-
-if [ -n "${SERVICEDIR}" ]; then
-    mkdir -p ${DESTDIR}${SERVICEDIR}
-    chmod 755 ${DESTDIR}${SERVICEDIR}
+if [ -n "${SYSTEMD}" ]; then
+    mkdir -p ${DESTDIR}${SYSTEMD}
+    chmod 755 ${DESTDIR}${SYSTEMD}
 fi
 
 mkdir -p ${DESTDIR}${SBINDIR}

Shorewall-core/lib.cli

@@ -367,17 +367,6 @@ resolve_arptables() {
     esac
 }
 
-#
-# Try to run the 'savesets' command
-#
-savesets() {
-    local supported
-
-    supported=$(run_it ${VARDIR}/firewall help | fgrep savesets )
-
-    [ -n "$supported" ] && run_it ${VARDIR}/firewall savesets ${g_restorepath}-ipsets
-}
-
 #
 # Save currently running configuration
 #
@@ -439,7 +428,7 @@ do_save() {
 	    ;;
     esac
 
-    if ! savesets;  then
+    if ! run_it ${VARDIR}/firewall savesets ${g_restorepath}-ipsets; then
 	case ${SAVE_IPSETS:=No} in
 	    [Yy]es)
 		case ${IPSET:=ipset} in
@@ -493,8 +482,6 @@ save_config() {
 
     [ -x $iptables_save ] || echo "$iptables-save does not exist or is not executable" >&2
 
-    [ -n "$g_counters" ] && iptables_save="$iptables_save --counters"
-
     if product_is_started ; then
 	[ -d ${VARDIR} ] || mkdir -p ${VARDIR}
 
@@ -1626,15 +1613,6 @@ restore_command() {
 			    g_noroutes=Yes
 			    option=${option#n}
 			    ;;
-			p*)
-			    [ -n "$(which conntrack)" ] || fatal_error "The '-p' option requires the conntrack utility which does not appear to be installed on this system"
-			    g_purge=Yes
-			    option=${option%p}
-			    ;;
-			C*)
-			    g_counters=Yes
-			    option=${option#C}
-			    ;;
 			*)
 			    usage 1
 			    ;;
@@ -3119,45 +3097,11 @@ reject_command() {
 }
 
 save_command() {
-    local finished
-    finished=0
-
-    shift
-
-    while [ $finished -eq 0 -a $# -gt 0 ]; do
-	option=$1
-	case $option in
-	    -*)
-		option=${option#-}
-
-		while [ -n "$option" ]; do
-		    case $option in
-			-)
-			    finished=1
-			    option=
-			    ;;
-			C*)
-			    g_counters=Yes
-			    option=${option#C}
-			    ;;
-			*)
-			    usage 1
-			    ;;
-		    esac
-		done
-		shift
-		;;
-	    *)
-		finished=1
-		;;
-	esac
-    done
-
     case $# in
-	0)
-	    ;;
 	1)
-	    RESTOREFILE="$1"
+	    ;;
+	2)
+	    RESTOREFILE="$2"
 	    validate_restorefile '<restore file>'
 	    ;;
 	*)
@@ -3452,11 +3396,7 @@ start_command() {
 	[ -n "$g_nolock" ] || mutex_on
 
 	if [ -x ${VARDIR}/firewall ]; then
-	    if [ -n "$g_fast" -a -x ${VARDIR}/${RESTOREFILE} -a ! ${VARDIR}/firewall -nt ${VARDIR}/${RESTOREFILE} ]; then
-		run_it ${VARDIR}/${RESTOREFILE} $g_debugging restore
-	    else
-		run_it ${VARDIR}/firewall $g_debugging start
-	    fi
+	    run_it ${VARDIR}/firewall $g_debugging start
 	    rc=$?
 	else
 	    error_message "${VARDIR}/firewall is missing or is not executable"
@@ -3492,14 +3432,6 @@ start_command() {
 			    finished=1
 			    option=
 			    ;;
-			f*)
-			    g_fast=Yes
-			    option=${option#f}
-			    ;;
-			C*)
-			    g_counters=Yes
-			    option=${option#C}
-			    ;;
 			p*)
 			    [ -n "$(which conntrack)" ] || fatal_error "The '-p' option requires the conntrack utility which does not appear to be installed on this system"
 			    g_purge=Yes
@@ -3561,10 +3493,6 @@ restart_command() {
 			    g_purge=Yes
 			    option=${option%p}
 			    ;;
-			C*)
-			    g_counters=Yes
-			    option=${option#C}
-			    ;;
 			*)
 			    usage 1
 			    ;;
@@ -3638,10 +3566,10 @@ usage() # $1 = exit status
     echo "   logwatch [<refresh interval>]"
     echo "   reject <address> ..."
     echo "   reset [ <chain> ... ]"
-    echo "   restart [ -n ] [ -p ] [ -f ] [ -C ] [ <directory> ]"
-    echo "   restore [ -n ] [ -p ] [ -C ] [ <file name> ]"
+    echo "   restart [ -n ] [ -p ] [ -f ] [ <directory> ]"
+    echo "   restore [ -n ] [ <file name> ]"
     echo "   run <command> [ <parameter> ... ]"
-    echo "   save [ -C ] [ <file name> ]"
+    echo "   save [ <file name> ]"
     echo "   [ show | list | ls ] [ -b ] [ -x ] [ -t {filter|mangle|nat} ] [ {chain [<chain> [ <chain> ... ]"
     echo "   [ show | list | ls ] [ -f ] capabilities"
     echo "   [ show | list | ls ] arptables"
@@ -3666,7 +3594,7 @@ usage() # $1 = exit status
     echo "   [ show | list | ls ] tc [ device ]"
     echo "   [ show | list | ls ] vardir"
     echo "   [ show | list | ls ] zones"
-    echo "   start [ -f ] [ -p ] [ -C ] [ <directory> ]"
+    echo "   start [ -f ] [ -p ] [ <directory> ]"
     echo "   stop"
     echo "   status [ -i ]"
     echo "   version [ -a ]"
@@ -3718,7 +3646,6 @@ shorewall_cli() {
     g_directives=
     g_inline=
     g_tcrules=
-    g_counters=
 
     VERBOSE=
     VERBOSITY=1

Shorewall-core/lib.common

@@ -157,7 +157,6 @@ run_it() {
 	[ -n "$g_timestamp" ]  && options=${options}t
 	[ -n "$g_purge" ]      && options=${options}p
 	[ -n "$g_recovering" ] && options=${options}r
-	[ -n "$g_counters" ]   && options=${options}c
 
 	options="${options}V $VERBOSITY"
 

Shorewall-core/shorewallrc.apple

@@ -14,7 +14,7 @@ INITDIR=                               #Unused on OS X
 INITFILE=                              #Unused on OS X
 INITSOURCE=                            #Unused on OS X
 ANNOTATED=                             #Unused on OS X
-SERVICEDIR=                            #Unused on OS X
+SYSTEMD=                               #Unused on OS X
 SERVICEFILE=                           #Unused on OS X
 SYSCONFDIR=                            #Unused on OS X
 SPARSE=Yes                             #Only install $PRODUCT/$PRODUCT.conf in $CONFDIR.

Shorewall-core/shorewallrc.archlinux

@@ -8,14 +8,14 @@ SHAREDIR=${PREFIX}/share               #Directory for arch-neutral files.
 LIBEXECDIR=${PREFIX}/share             #Directory for executable scripts.
 PERLLIBDIR=${PREFIX}/share/shorewall   #Directory to install Shorewall Perl module directory
 CONFDIR=/etc                           #Directory where subsystem configurations are installed
-SBINDIR=/usr/bin                       #Directory where system administration programs are installed
+SBINDIR=/usr/sbin                      #Directory where system administration programs are installed
 MANDIR=${SHAREDIR}/man                 #Directory where manpages are installed.
 INITDIR=                               #Directory where SysV init scripts are installed.
 INITFILE=                              #Name of the product's installed SysV init script
 INITSOURCE=                            #Name of the distributed file to be installed as the SysV init script
 ANNOTATED=                             #If non-zero, annotated configuration files are installed
 SYSCONFDIR=                            #Directory where SysV init parameter files are installed
-SERVICEDIR=/usr/lib/systemd/system     #Directory where .service files are installed (systems running systemd only)
+SYSTEMD=/usr/lib/systemd/system        #Directory where .service files are installed (systems running systemd only)
 SERVICEFILE=                           #Name of the file to install in $SYSTEMD. Default is $PRODUCT.service
 SPARSE=                                #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
 VARLIB=/var/lib                        #Directory where product variable data is stored.

Shorewall-core/shorewallrc.cygwin

@@ -14,7 +14,7 @@ INITDIR=/etc/init.d                   #Unused on Cygwin
 INITFILE=                             #Unused on Cygwin
 INITSOURCE=                           #Unused on Cygwin
 ANNOTATED=                            #Unused on Cygwin
-SERVICEDIR=                           #Unused on Cygwin
+SYSTEMD=                              #Unused on Cygwin
 SERVICEFILE=                          #Unused on Cygwin
 SYSCONFDIR=                           #Unused on Cygwin
 SPARSE=Yes                            #Only install $PRODUCT/$PRODUCT.conf in $CONFDIR.

Shorewall-core/shorewallrc.debian

@@ -17,7 +17,7 @@ ANNOTATED=                              #If non-zero, annotated configuration fi
 SYSCONFFILE=default.debian              #Name of the distributed file to be installed in $SYSCONFDIR
 SERVICEFILE=                      	#Name of the file to install in $SYSTEMD. Default is $PRODUCT.service
 SYSCONFDIR=/etc/default                 #Directory where SysV init parameter files are installed
-SERVICEDIR=                             #Directory where .service files are installed (systems running systemd only)
+SYSTEMD=                                #Directory where .service files are installed (systems running systemd only)
 SPARSE=Yes                              #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
 VARLIB=/var/lib                         #Directory where product variable data is stored.
 VARDIR=${VARLIB}/$PRODUCT               #Directory where product variable data is stored.

Shorewall-core/shorewallrc.default

@@ -14,7 +14,7 @@ INITDIR=/etc/init.d                     #Directory where SysV init scripts are i
 INITFILE=$PRODUCT                       #Name of the product's installed SysV init script
 INITSOURCE=init.sh                      #Name of the distributed file to be installed as the SysV init script
 ANNOTATED=                              #If non-zero, annotated configuration files are installed
-SERVICEDIR=                             #Directory where .service files are installed (systems running systemd only)
+SYSTEMD=                                #Directory where .service files are installed (systems running systemd only)
 SERVICEFILE=                            #Name of the file to install in $SYSTEMD. Default is $PRODUCT.service
 SYSCONFFILE=                            #Name of the distributed file to be installed in $SYSCONFDIR
 SYSCONFDIR=                             #Directory where SysV init parameter files are installed

Shorewall-core/shorewallrc.redhat

@@ -14,7 +14,7 @@ INITDIR=/etc/rc.d/init.d                #Directory where SysV init scripts are i
 INITFILE=$PRODUCT                       #Name of the product's installed SysV init script
 INITSOURCE=init.fedora.sh               #Name of the distributed file to be installed as the SysV init script
 ANNOTATED=                              #If non-zero, annotated configuration files are installed
-SERVICEDIR=/lib/systemd/system          #Directory where .service files are installed (systems running systemd only)
+SYSTEMD=/lib/systemd/system             #Directory where .service files are installed (systems running systemd only)
 SYSCONFFILE=sysconfig                   #Name of the distributed file to be installed as $SYSCONFDIR/$PRODUCT
 SERVICEFILE=                      	#Name of the file to install in $SYSTEMD. Default is $PRODUCT.service
 SYSCONFDIR=/etc/sysconfig/              #Directory where SysV init parameter files are installed

Shorewall-core/shorewallrc.slackware

@@ -15,7 +15,7 @@ AUXINITSOURCE=init.slackware.firewall.sh   #Name of the distributed file to be i
 AUXINITFILE=rc.firewall                    #Name of the product's installed SysV init script
 INITSOURCE=init.slackware.$PRODUCT.sh      #Name of the distributed file to be installed as a second SysV init script
 INITFILE=rc.$PRODUCT                       #Name of the product's installed second init script
-SERVICEDIR=                                #Name of the directory where .service files are installed (systems running systemd only)
+SYSTEMD=                                   #Name of the directory where .service files are installed (systems running systemd only)
 SERVICEFILE=                               #Name of the file to install in $SYSTEMD. Default is $PRODUCT.service
 SYSCONFFILE=                               #Name of the distributed file to be installed in $SYSCONFDIR
 SYSCONFDIR=                                #Name of the directory where SysV init parameter files are installed.

Shorewall-core/shorewallrc.suse

@@ -14,7 +14,7 @@ INITDIR=/etc/init.d                                   #Directory where SysV init
 INITFILE=$PRODUCT                                     #Name of the product's SysV init script
 INITSOURCE=init.suse.sh                               #Name of the distributed file to be installed as the SysV init script
 ANNOTATED=                                            #If non-zero, annotated configuration files are installed
-SERVICEDIR=                                           #Directory where .service files are installed (systems running systemd only)
+SYSTEMD=                                              #Directory where .service files are installed (systems running systemd only)
 SERVICEFILE=                      		      #Name of the file to install in $SYSTEMD. Default is $PRODUCT.service
 SYSCONFFILE=sysconfig                                 #Name of the distributed file to be installed in $SYSCONFDIR
 SYSCONFDIR=/etc/sysconfig/                            #Directory where SysV init parameter files are installed

Shorewall-init/install.sh

@@ -330,16 +330,12 @@ fi
 #
 # Install the .service file
 #
-if [ -z "${SERVICEDIR}" ]; then
-    SERVICEDIR="$SYSTEMD"
-fi
-
-if [ -n "$SERVICEDIR" ]; then
-    mkdir -p ${DESTDIR}${SERVICEDIR}
+if [ -n "$SYSTEMD" ]; then
+    mkdir -p ${DESTDIR}${SYSTEMD}
     [ -z "$SERVICEFILE" ] && SERVICEFILE=$PRODUCT.service
-    run_install $OWNERSHIP -m 644 $SERVICEFILE ${DESTDIR}${SERVICEDIR}/$PRODUCT.service
-    [ ${SBINDIR} != /sbin ] && eval sed -i \'s\|/sbin/\|${SBINDIR}/\|\' ${DESTDIR}${SERVICEDIR}/$PRODUCT.service
-    echo "Service file $SERVICEFILE installed as ${DESTDIR}${SERVICEDIR}/$PRODUCT.service"
+    run_install $OWNERSHIP -m 644 $SERVICEFILE ${DESTDIR}${SYSTEMD}/$PRODUCT.service
+    [ ${SBINDIR} != /sbin ] && eval sed -i \'s\|/sbin/\|${SBINDIR}/\|\' ${DESTDIR}${SYSTEMD}/$PRODUCT.service
+    echo "Service file $SERVICEFILE installed as ${DESTDIR}${SYSTEMD}/$PRODUCT.service"
     if [ -n "$DESTDIR" -o $configure -eq 0 ]; then
 	mkdir -p ${DESTDIR}${SBINDIR}
         chmod 755 ${DESTDIR}${SBINDIR}
@@ -372,6 +368,8 @@ chmod 644 ${DESTDIR}${SHAREDIR}/shorewall-init/version
 #
 # Remove and create the symbolic link to the init script
 #
+echo CONFDIR is $CONFDIR
+
 if [ -z "$DESTDIR" ]; then
     rm -f ${SHAREDIR}/shorewall-init/init
     ln -s ${INITDIR}/${INITFILE} ${SHAREDIR}/shorewall-init/init
@@ -517,7 +515,7 @@ if [ -z "$DESTDIR" ]; then
 	    # not by the installer
 	    /bin/true
 	else
-	    if [ -n "$SERVICEDIR" ]; then
+	    if [ -n "$SYSTEMD" ]; then
 		if systemctl enable shorewall-init.service; then
 		    echo "Shorewall Init will start automatically at boot"
 		fi

Shorewall-init/shorewall-init.service

@@ -13,8 +13,8 @@ Type=oneshot
 RemainAfterExit=yes
 EnvironmentFile=-/etc/sysconfig/shorewall-init
 StandardOutput=syslog
-ExecStart=/sbin/shorewall-init start
-ExecStop=/sbin/shorewall-init stop
+ExecStart=/sbin/shorewall-init $OPTIONS start
+ExecStop=/sbin/shorewall-init $OPTIONS stop
 
 [Install]
 WantedBy=basic.target

Shorewall-init/shorewall-init.service.214

@@ -1,21 +0,0 @@
-#
-#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall
-#
-#     Copyright 2011 Jonathan Underwood <jonathan.underwood@gmail.com>
-#
-[Unit]
-Description=Shorewall IPv4 firewall (bootup security)
-Before=network-pre.target
-Wants=network-pre.target
-Conflicts=iptables.service firewalld.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=-/etc/sysconfig/shorewall-init
-StandardOutput=syslog
-ExecStart=/sbin/shorewall-init start
-ExecStop=/sbin/shorewall-init stop
-
-[Install]
-WantedBy=basic.target

Shorewall-lite/init.fedora.sh

@@ -39,7 +39,7 @@ fi
 
 start() {
     echo -n $"Starting Shorewall: "
-    $shorewall $OPTIONS start $STARTOPTIONS 2>&1 | $logger
+    $shorewall $OPTIONS start 2>&1 | $logger
     retval=${PIPESTATUS[0]}
     if [[ $retval == 0 ]]; then
 	touch $lockfile
@@ -69,7 +69,7 @@ restart() {
 # Note that we don't simply stop and start since shorewall has a built in
 # restart which stops the firewall if running and then starts it.
     echo -n $"Restarting Shorewall: "
-    $shorewall $OPTIONS restart $RESTARTOPTIONS 2>&1 | $logger
+    $shorewall $OPTIONS restart 2>&1 | $logger
     retval=${PIPESTATUS[0]}
     if [[ $retval == 0 ]]; then
 	touch $lockfile

Shorewall-lite/install.sh

@@ -381,7 +381,7 @@ fi
 
 if [ -n "$INITFILE" ]; then
     if [ -f "${INITSOURCE}" ]; then
-	initfile="${DESTDIR}${INITDIR}/${INITFILE}"
+	initfile="${DESTDIR}/${INITDIR}/${INITFILE}"
 	install_file ${INITSOURCE} "$initfile" 0544
 
 	[ "${SHAREDIR}" = /usr/share ] || eval sed -i \'s\|/usr/share/\|${SHAREDIR}/\|\' "$initfile"
@@ -392,16 +392,12 @@ fi
 #
 # Install the .service file
 #
-if [ -z "${SERVICEDIR}" ]; then
-    SERVICEDIR="$SYSTEMD"
-fi
-
-if [ -n "$SERVICEDIR" ]; then
-    mkdir -p ${DESTDIR}${SERVICEDIR}
+if [ -n "$SYSTEMD" ]; then
+    mkdir -p ${DESTDIR}${SYSTEMD}
     [ -z "$SERVICEFILE" ] && SERVICEFILE=$PRODUCT.service
-    run_install $OWNERSHIP -m 644 $SERVICEFILE ${DESTDIR}${SERVICEDIR}/$PRODUCT.service
-    [ ${SBINDIR} != /sbin ] && eval sed -i \'s\|/sbin/\|${SBINDIR}/\|\' ${DESTDIR}${SERVICEDIR}/$PRODUCT.service
-    echo "Service file $SERVICEFILE installed as ${DESTDIR}${SERVICEDIR}/$PRODUCT.service"
+    run_install $OWNERSHIP -m 644 $SERVICEFILE ${DESTDIR}${SYSTEMD}/$PRODUCT.service
+    [ ${SBINDIR} != /sbin ] && eval sed -i \'s\|/sbin/\|${SBINDIR}/\|\' ${DESTDIR}${SYSTEMD}/$PRODUCT.service
+    echo "Service file $SERVICEFILE installed as ${DESTDIR}${SYSTEMD}/$PRODUCT.service"
 fi
 #
 # Install the config file
@@ -543,7 +539,7 @@ if [ ${SHAREDIR} != /usr/share ]; then
 fi
 
 if [ $configure -eq 1 -a -z "$DESTDIR" -a -n "$first_install" -a -z "${cygwin}${mac}" ]; then
-    if [ -n "$SERVICEDIR" ]; then
+    if [ -n "$SYSTEMD" ]; then
 	if systemctl enable ${PRODUCT}.service; then
 	    echo "$Product will start automatically at boot"
 	fi

Shorewall-lite/manpages/shorewall-lite.xml

@@ -299,7 +299,7 @@
 
       <arg><option>-n</option></arg>
 
-      <arg><option>-p</option><arg><option>-C</option></arg></arg>
+      <arg><option>-p</option></arg>
 
       <arg><replaceable>directory</replaceable></arg>
     </cmdsynopsis>
@@ -314,8 +314,6 @@
 
       <arg choice="plain"><option>restore</option></arg>
 
-      <arg><option>-C</option></arg>
-
       <arg><replaceable>filename</replaceable></arg>
     </cmdsynopsis>
 
@@ -342,8 +340,7 @@
 
       <arg>-<replaceable>options</replaceable></arg>
 
-      <arg
-      choice="plain"><option>save</option><arg><option>-C</option></arg></arg>
+      <arg choice="plain"><option>save</option></arg>
 
       <arg choice="opt"><replaceable>filename</replaceable></arg>
     </cmdsynopsis>
@@ -477,10 +474,6 @@
       <arg><option>-n</option></arg>
 
       <arg><option>-p</option></arg>
-
-      <arg><option>-f</option></arg>
-
-      <arg><option>-C</option></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
@@ -533,9 +526,8 @@
 
     <para>The nolock <option>option</option> prevents the command from
     attempting to acquire the Shorewall-lite lockfile. It is useful if you
-    need to include <command>shorewall</command> commands in the
-    <filename>started</filename> <ulink
-    url="../shorewall_extension_scripts.html">extension script</ulink>.</para>
+    need to include <command>shorewall</command> commands in
+    <filename>/etc/shorewall/started</filename>.</para>
 
     <para>The <emphasis>options</emphasis> control the amount of output that
     the command produces. They consist of a sequence of the letters <emphasis
@@ -546,8 +538,8 @@
     role="bold">v</emphasis> adds one to the effective verbosity and each
     <emphasis role="bold">q</emphasis> subtracts one from the effective
     VERBOSITY. Alternately, <emphasis role="bold">v</emphasis> may be followed
-    immediately with one of -1,0,1,2 to specify VERBOSITY. There may be no
-    white-space between <emphasis role="bold">v</emphasis> and the
+    immediately with one of -1,0,1,2 to specify a specify VERBOSITY. There may
+    be no white-space between <emphasis role="bold">v</emphasis> and the
     VERBOSITY.</para>
 
     <para>The <emphasis>options</emphasis> may also include the letter
@@ -827,12 +819,6 @@
           <para>The <option>-p</option> option causes the connection tracking
           table to be flushed; the <command>conntrack</command> utility must
           be installed to use this option.</para>
-
-          <para>The <option>-C</option> option was added in Shorewall 4.6.5.
-          If the specified (or implicit) firewall script is the one that
-          generated the current running configuration, then the running
-          netfilter configuration will be reloaded as is so as to preserve the
-          iptables packet and byte counters.</para>
         </listitem>
       </varlistentry>
 
@@ -848,19 +834,6 @@
           <emphasis>filename</emphasis> is given then Shorewall-lite will be
           restored from the file specified by the RESTOREFILE option in <ulink
           url="shorewall.conf.html">shorewall.conf</ulink>(5).</para>
-
-          <caution>
-            <para>If your iptables ruleset depends on variables that are
-            detected at run-time, either in your params file or by
-            Shorewall-generated code, <command>restore</command> will use the
-            values that were current when the ruleset was saved, which may be
-            different from the current values.</para>
-          </caution>
-
-          <para>The <option>-C</option> option was added in Shorewall 4.6.5.
-          If the <option>-C</option> option was specified during <emphasis
-          role="bold">shorewall save</emphasis>, then the counters saved by
-          that operation will be restored.</para>
         </listitem>
       </varlistentry>
 
@@ -892,10 +865,6 @@
           <emphasis>filename</emphasis> is not given then the state is saved
           in the file specified by the RESTOREFILE option in <ulink
           url="shorewall.conf.html">shorewall.conf</ulink>(5).</para>
-
-          <para>The <option>-C</option> option, added in Shorewall 4.6.5,
-          causes the iptables packet and byte counters to be saved along with
-          the chains and rules.</para>
         </listitem>
       </varlistentry>
 
@@ -1133,22 +1102,6 @@
           <para>The <option>-p</option> option causes the connection tracking
           table to be flushed; the <command>conntrack</command> utility must
           be installed to use this option.</para>
-
-          <para>The <option>-m</option> option prevents the firewall script
-          from modifying the current routing configuration.</para>
-
-          <para>The <option>-f</option> option was added in Shorewall 4.6.5.
-          If the RESTOREFILE named in <ulink
-          url="shorewall.conf.html">shorewall.conf</ulink>(5) exists, is
-          executable and is not older than the current filewall script, then
-          that saved configuration is restored.</para>
-
-          <para>The <option>-C</option> option was added in Shorewall 4.6.5
-          and is only meaningful when the <option>-f</option> option is also
-          specified. If the previously-saved configuration is restored, and if
-          the <option>-C</option> option was also specified in the <emphasis
-          role="bold">save</emphasis> command, then the packet and byte
-          counters will be restored.</para>
         </listitem>
       </varlistentry>
 

Shorewall-lite/shorewall-lite.service

@@ -13,7 +13,7 @@ Type=oneshot
 RemainAfterExit=yes
 EnvironmentFile=-/etc/sysconfig/shorewall-lite
 StandardOutput=syslog
-ExecStart=/sbin/shorewall-lite $OPTIONS start $STARTOPTIONS
+ExecStart=/sbin/shorewall-lite $OPTIONS start
 ExecStop=/sbin/shorewall-lite $OPTIONS stop
 
 [Install]

Shorewall-lite/shorewall-lite.service.214

@@ -1,20 +0,0 @@
-#
-#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall
-#
-#     Copyright 2011 Jonathan Underwood <jonathan.underwood@gmail.com>
-#
-[Unit]
-Description=Shorewall IPv4 firewall (lite)
-After=network-online.target
-Conflicts=iptables.service firewalld.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=-/etc/sysconfig/shorewall-lite
-StandardOutput=syslog
-ExecStart=/sbin/shorewall-lite $OPTIONS start $STARTOPTIONS
-ExecStop=/sbin/shorewall-lite $OPTIONS stop
-
-[Install]
-WantedBy=basic.target

Shorewall/Perl/Shorewall/Chains.pm

@@ -4876,79 +4876,62 @@ my %norate = ( DROP => 1, REJECT => 1 );
 # Create a "-m limit" match for the passed LIMIT/BURST
 #
 sub do_ratelimit( $$ ) {
-    my ( $rates, $action ) = @_;
+    my ( $rate, $action ) = @_;
 
-    return '' unless $rates and $rates ne '-';
+    return '' unless $rate and $rate ne '-';
 
     fatal_error "Rate Limiting not available with $action" if $norate{$action};
+    #
+    # "-m hashlimit" match for the passed LIMIT/BURST
+    #
+    if ( $rate =~ /^[sd]:{1,2}/ ) {
+	require_capability 'HASHLIMIT_MATCH', 'Per-ip rate limiting' , 's';
 
-    my @rates = split_list $rates, 'rate';
+	my $limit = "-m hashlimit ";
+	my $match = have_capability( 'OLD_HL_MATCH' ) ? 'hashlimit' : 'hashlimit-upto';
+	my $units;
 
-    if ( @rates == 2 ) {
-	$rates[0] = 's:' . $rates[0];
-	$rates[1] = 'd:' . $rates[1];
-    } elsif ( @rates > 2 ) {
-	fatal error "Only two rates may be specified";
-    }
-
-    my $limit = '';
-
-    for my $rate ( @rates ) {
-	#
-	# "-m hashlimit" match for the passed LIMIT/BURST
-	#
-	if ( $rate =~ /^([sd]):{1,2}/ ) {
-	    require_capability 'HASHLIMIT_MATCH', 'Per-ip rate limiting' , 's';
-
-	    my $match = have_capability( 'OLD_HL_MATCH' ) ? 'hashlimit' : 'hashlimit-upto';
-	    my $units;
-
-	    $limit .= "-m hashlimit ";
-	    
-	    if ( $rate =~ /^[sd]:((\w*):)?((\d+)(\/(sec|min|hour|day))?):(\d+)$/ ) {
-		fatal_error "Invalid Rate ($3)" unless $4;
-		fatal_error "Invalid Burst ($7)" unless $7;
-		$limit .= "--$match $3 --hashlimit-burst $7 --hashlimit-name ";
-		$limit .= $2 ? $2 : 'shorewall' . $hashlimitset++;
-		$limit .= ' --hashlimit-mode ';
-		$units = $6;
-	    } elsif ( $rate =~ /^[sd]:((\w*):)?((\d+)(\/(sec|min|hour|day))?)$/ ) {
-		fatal_error "Invalid Rate ($3)" unless $4;
-		$limit .= "--$match $3 --hashlimit-name ";
-		$limit .= $2 ? $2 :  'shorewall' . $hashlimitset++;
-		$limit .= ' --hashlimit-mode ';
-		$units = $6;
-	    } else {
-		fatal_error "Invalid rate ($rate)";
-	    }
-
-	    $limit .= $rate =~ /^s:/ ? 'srcip ' : 'dstip ';
-
-	    if ( $units && $units ne 'sec' ) {
-		my $expire = 60000; # 1 minute in milliseconds
-
-		if ( $units ne 'min' ) {
-		    $expire *= 60; #At least an hour
-		    $expire *= 24 if $units eq 'day';
-		}
-
-		$limit .= "--hashlimit-htable-expire $expire ";
-	    }
+	if ( $rate =~ /^[sd]:((\w*):)?((\d+)(\/(sec|min|hour|day))?):(\d+)$/ ) {
+	    fatal_error "Invalid Rate ($3)" unless $4;
+	    fatal_error "Invalid Burst ($7)" unless $7;
+	    $limit .= "--$match $3 --hashlimit-burst $7 --hashlimit-name ";
+	    $limit .= $2 ? $2 : 'shorewall' . $hashlimitset++;
+	    $limit .= ' --hashlimit-mode ';
+	    $units = $6;
+	} elsif ( $rate =~ /^[sd]:((\w*):)?((\d+)(\/(sec|min|hour|day))?)$/ ) {
+	    fatal_error "Invalid Rate ($3)" unless $4;
+	    $limit .= "--$match $3 --hashlimit-name ";
+	    $limit .= $2 ? $2 :  'shorewall' . $hashlimitset++;
+	    $limit .= ' --hashlimit-mode ';
+	    $units = $6;
 	} else {
-	    if ( $rate =~ /^((\d+)(\/(sec|min|hour|day))?):(\d+)$/ ) {
-		fatal_error "Invalid Rate ($1)" unless $2;
-		fatal_error "Invalid Burst ($5)" unless $5;
-		$limit = "-m limit --limit $1 --limit-burst $5 ";
-	    } elsif ( $rate =~ /^(\d+)(\/(sec|min|hour|day))?$/ )  {
-		fatal_error "Invalid Rate (${1}${2})" unless $1;
-		$limit = "-m limit --limit $rate ";
-	    } else {
-		fatal_error "Invalid rate ($rate)";
-	    }
+	    fatal_error "Invalid rate ($rate)";
 	}
-    }
 
-    $limit;
+	$limit .= $rate =~ /^s:/ ? 'srcip ' : 'dstip ';
+
+	if ( $units && $units ne 'sec' ) {
+	    my $expire = 60000; # 1 minute in milliseconds
+
+	    if ( $units ne 'min' ) {
+		$expire *= 60; #At least an hour
+		$expire *= 24 if $units eq 'day';
+	    }
+
+	    $limit .= "--hashlimit-htable-expire $expire ";
+	}
+
+	$limit;
+    } elsif ( $rate =~ /^((\d+)(\/(sec|min|hour|day))?):(\d+)$/ ) {
+	fatal_error "Invalid Rate ($1)" unless $2;
+	fatal_error "Invalid Burst ($5)" unless $5;
+	"-m limit --limit $1 --limit-burst $5 ";
+    } elsif ( $rate =~ /^(\d+)(\/(sec|min|hour|day))?$/ )  {
+	fatal_error "Invalid Rate (${1}${2})" unless $1;
+	"-m limit --limit $rate ";
+    } else {
+	fatal_error "Invalid rate ($rate)";
+    }
 }
 
 #
@@ -6521,6 +6504,7 @@ sub set_chain_variables() {
 
 	emit( 'IPTABLES_RESTORE=${IPTABLES}-restore',
 	      '[ -x "$IPTABLES_RESTORE" ] || startup_error "$IPTABLES_RESTORE does not exist or is not executable"' );
+
 	emit( 'g_tool=$IPTABLES' );
     } else {
 	if ( $config{IP6TABLES} ) {
@@ -6535,6 +6519,7 @@ sub set_chain_variables() {
 
 	emit( 'IP6TABLES_RESTORE=${IP6TABLES}-restore',
 	      '[ -x "$IP6TABLES_RESTORE" ] || startup_error "$IP6TABLES_RESTORE does not exist or is not executable"' );
+
 	emit( 'g_tool=$IP6TABLES' );
     }
 
@@ -7907,18 +7892,14 @@ sub emitr1( $$ ) {
 
 sub save_dynamic_chains() {
 
-    my $tool    = $family == F_IPV4 ? '${IPTABLES}'      : '${IP6TABLES}';
-    my $utility = $family == F_IPV4 ? 'iptables-restore' : 'ip6tables-restore';
+    my $tool;
 
     emit ( 'if [ "$COMMAND" = restart -o "$COMMAND" = refresh ]; then' );
     push_indent;
 
-    emit( 'if [ -n "$g_counters" ]; then' ,
-	  "    ${tool}-save --counters | grep -vE '[ :]shorewall ' > \${VARDIR}/.${utility}-input",
-	  "fi\n"
-	);
-
     if ( have_capability 'IPTABLES_S' ) {
+	$tool = $family == F_IPV4 ? '${IPTABLES}' : '${IP6TABLES}';
+
 	emit <<"EOF";
 if chain_exists 'UPnP -t nat'; then
     $tool -t nat -S UPnP | tail -n +2 > \${VARDIR}/.UPnP
@@ -7938,7 +7919,6 @@ else
     rm -f \${VARDIR}/.dynamic
 fi
 EOF
-
     } else {
 	$tool = $family == F_IPV4 ? '${IPTABLES}-save' : '${IP6TABLES}-save';
 
@@ -8243,30 +8223,18 @@ sub create_netfilter_load( $ ) {
 	   '# Create the input to iptables-restore/ip6tables-restore and pass that input to the utility',
 	   '#',
 	   'setup_netfilter()',
-	   '{',
-	   '    local option',
-	);
+	   '{'
+	   );
 
     push_indent;
 
     my $utility = $family == F_IPV4 ? 'iptables-restore' : 'ip6tables-restore';
     my $UTILITY = $family == F_IPV4 ? 'IPTABLES_RESTORE' : 'IP6TABLES_RESTORE';
 
-    emit( '',
-	  'if [ "$COMMAND" = restart -a -n "$g_counters" ] && chain_exists $g_sha1sum1 && chain_exists $g_sha1sum2 ; then',
-	  '    option="--counters"',
-	  '',
-	  '    progress_message "Reusing existing ruleset..."',
-	  '',
-	  'else'
-	);
-
-    push_indent;
-
-    emit 'option=';
-
     save_progress_message "Preparing $utility input...";
 
+    emit '';
+
     emit "exec 3>\${VARDIR}/.${utility}-input";
 
     enter_cat_mode;
@@ -8305,14 +8273,6 @@ sub create_netfilter_load( $ ) {
 		push @chains, $chainref;
 	    }
 	}
-	#
-	# SHA1SUM chains for handling 'restart -s'
-	#
-	if ( $table eq 'filter' ) {
-	    emit_unindented ':$g_sha1sum1 - [0:0]';
-	    emit_unindented ':$g_sha1sum2 - [0:0]';
-	}
-
 	#
 	# Then emit the rules
 	#
@@ -8327,24 +8287,20 @@ sub create_netfilter_load( $ ) {
     }
 
     enter_cmd_mode;
-
-    pop_indent, emit "fi\n";
     #
     # Now generate the actual ip[6]tables-restore command
     #
     emit(  'exec 3>&-',
-	   '' );
-
-    emit( '[ -n "$g_debug_iptables" ] && command=debug_restore_input || command="$' . $UTILITY . ' $option"' );
-
-    emit( '',
-	  'progress_message2 "Running $command..."',
-	  '',
-	  "cat \${VARDIR}/.${utility}-input | \$command # Use this nonsensical form to appease SELinux",
-	  'if [ $? != 0 ]; then',
-	  qq(    fatal_error "iptables-restore Failed. Input is in \${VARDIR}/.${utility}-input"),
-	  "fi\n"
-	);
+	   '',
+	   '[ -n "$g_debug_iptables" ] && command=debug_restore_input || command=$' . $UTILITY,
+	   '',
+	   'progress_message2 "Running $command..."',
+	   '',
+	   "cat \${VARDIR}/.${utility}-input | \$command # Use this nonsensical form to appease SELinux",
+	   'if [ $? != 0 ]; then',
+	   qq(    fatal_error "iptables-restore Failed. Input is in \${VARDIR}/.${utility}-input"),
+	   "fi\n"
+	   );
 
     pop_indent;
 

Shorewall/Perl/Shorewall/Compiler.pm

@@ -352,8 +352,7 @@ sub generate_script_3($) {
 
     emit "#\n# Start/Restart the Firewall\n#";
 
-    emit( 'define_firewall() {',
-	  '    local options' );
+    emit 'define_firewall() {';
 
     push_indent;
 
@@ -471,12 +470,10 @@ sub generate_script_3($) {
     emit( '',
 	  'if [ $COMMAND = restore ]; then',
 	  '    iptables_save_file=${VARDIR}/$(basename $0)-iptables',
-	  '    if [ -f $iptables_save_file ]; then',
-	  '        [ -n "$g_counters" ] && options=--counters'
-	);
+	  '    if [ -f $iptables_save_file ]; then' );
 
     if ( $family == F_IPV4 ) {
-	emit( '        cat $iptables_save_file | $IPTABLES_RESTORE $options # Use this nonsensical form to appease SELinux' );
+	emit( '        cat $iptables_save_file | $IPTABLES_RESTORE # Use this nonsensical form to appease SELinux' );
 
 	emit( '',
 	      '        arptables_save_file=${VARDIR}/$(basename $0)-arptables',
@@ -486,7 +483,7 @@ sub generate_script_3($) {
 	    if $config{SAVE_ARPTABLES};
 
     } else {
-	emit '        cat $iptables_save_file | $IP6TABLES_RESTORE $options # Use this nonsensical form to appease SELinux'
+	emit '        cat $iptables_save_file | $IP6TABLES_RESTORE # Use this nonsensical form to appease SELinux'
     }
 
     emit( '    else',
@@ -515,41 +512,45 @@ EOF
     #
     # Use a parameter list rather than 'here documents' to avoid an extra blank line
     #
-    emit( '    run_refreshed_exit',
-	  '    do_iptables -N shorewall' );
+    emit(
+'    run_refreshed_exit',
+'    do_iptables -N shorewall' );
 
     emit ( '    do_iptables -A shorewall -m recent --set --name %CURRENTTIME' ) if have_capability 'RECENT_MATCH';
 
     emit(
-	"    set_state Started $config_dir",
-	'    [ $0 = ${VARDIR}/firewall ] || cp -f $(my_pathname) ${VARDIR}/firewall',
-        'else',
-	'    setup_netfilter'
+"    set_state Started $config_dir",
+'    [ $0 = ${VARDIR}/firewall ] || cp -f $(my_pathname) ${VARDIR}/firewall',
+'else',
+'    setup_netfilter'
 	);
-
     push_indent;
     emit 'setup_arptables' if $have_arptables;
     setup_load_distribution;
     pop_indent;
 
-    emit( "    conditionally_flush_conntrack\n" );
-
+    emit<<'EOF';
+    conditionally_flush_conntrack
+EOF
     push_indent;
     initialize_switches;
     setup_forwarding( $family , 0 );
     pop_indent;
 
-    emit( '    run_start_exit', 
-	  '    do_iptables -N shorewall',
-	  '' );
+    emit<<"EOF";
+    run_start_exit
+    do_iptables -N shorewall
+EOF
 
-    emit( '    do_iptables -A shorewall -m recent --set --name %CURRENTTIME' ) if have_capability 'RECENT_MATCH';
+    emit ( '    do_iptables -A shorewall -m recent --set --name %CURRENTTIME' ) if have_capability 'RECENT_MATCH';
 
-    emit( "    set_state Started $config_dir",
-	  '    my_pathname=$(my_pathname)',
-	  '    [ $my_pathname = ${VARDIR}/firewall ] || cp -f $my_pathname ${VARDIR}/firewall',
-	  '    run_started_exit',
-	  "fi\n" );
+    emit<<"EOF";
+    set_state Started $config_dir
+    my_pathname=\$(my_pathname)
+    [ \$my_pathname = \${VARDIR}/firewall ] || cp -f \$my_pathname \${VARDIR}/firewall
+    run_started_exit
+fi
+EOF
 
     emit<<'EOF';
 date > ${VARDIR}/restarted

Shorewall/Perl/Shorewall/Config.pm

@@ -40,7 +40,6 @@ use Cwd qw(abs_path getcwd);
 use autouse 'Carp' => qw(longmess confess);
 use Scalar::Util 'reftype';
 use FindBin;
-use Digest::SHA qw(sha1_hex);
 
 our @ISA = qw(Exporter);
 #
@@ -89,7 +88,6 @@ our @EXPORT = qw(
 our @EXPORT_OK = qw( $shorewall_dir initialize shorewall);
 
 our %EXPORT_TAGS = ( internal => [ qw( create_temp_script
-                                       generate_sha1
 				       finalize_script
 				       enable_script
 				       disable_script
@@ -1762,13 +1760,6 @@ sub create_temp_script( $$ ) {
 
 }
 
-# Generate the SHA1 digest of the (incomplete script)
-#
-sub generate_sha1() {
-    my $data = `cat $tempfile`;
-    sha1_hex $data;
-}
-
 #
 # Finalize the script file
 #
@@ -1778,19 +1769,6 @@ sub finalize_script( $ ) {
     $script = 0;
 
     if ( $file ne '-' ) {
-	my $sha1sum  = generate_sha1;
-	my $sha1sum1 = join( '-', 'sha-lh', substr( $sha1sum, 0, 20 ) );
-	my $sha1sum2 = join( '-', 'sha-rh', substr( $sha1sum, -20   ) );
-
-	@ARGV = ( $tempfile );
-	$^I = '';
-
-	while ( <> ) {
-	    s/g_sha1sum1=/g_sha1sum1=$sha1sum1/;
-	    s/g_sha1sum2=/g_sha1sum2=$sha1sum2/;
-	    print;
-	}
-
 	rename $tempfile, $file or fatal_error "Cannot Rename $tempfile to $file: $!";
 	chmod 0700, $file or fatal_error "Cannot secure $file for execute access";
 	progress_message3 "Shorewall configuration compiled to $file" unless $export;
@@ -5078,23 +5056,15 @@ sub unsupported_yes_no_warning( $ ) {
 #
 # Process the params file
 #
-sub get_params( $ ) {
-    my $export = $_[0];
-
+sub get_params() {
     my $fn = find_file 'params';
 
     my %reserved = ( COMMAND => 1, CONFDIR => 1, SHAREDIR => 1, VARDIR => 1 );
 
     if ( -f $fn ) {
-	my $shellpath = $export ? '/bin/sh' : $config{SHOREWALL_SHELL} || '/bin/sh';
-
-	$shellpath = which( $shellpath ) unless $shellpath =~ '/';
-
-	fatal_error "SHOREWALL_SHELL ($shellpath) is not found or is not executable" unless -x $shellpath;
-
 	progress_message2 "Processing $fn ...";
 
-	my $command = "$shellpath $FindBin::Bin/getparams $fn " . join( ':', @config_path ) . " $family";
+	my $command = "$FindBin::Bin/getparams $fn " . join( ':', @config_path ) . " $family";
 	#
 	# getparams silently sources the params file under 'set -a', then executes 'export -p'
 	#
@@ -5364,7 +5334,7 @@ sub get_configuration( $$$$$ ) {
 
     ensure_config_path;
 
-    get_params( $export );
+    get_params;
 
     process_shorewall_conf( $update, $annotate, $directives );
 

Shorewall/Perl/Shorewall/Proc.pm

@@ -356,35 +356,15 @@ sub setup_log_backend($) {
 
 	emit( 'progress_message2 "Setting up log backend"',
 	      '',
-	      "if [ -f $file ]; then"
-	    );
-
-	if ( $setting =~ /ip6?t_log/i ) {
-	    my $alternative = 'nf_log_ipv' . $family;
-
-	    emit( "    setting=$setting",
-		  '',
-		  "    fgrep -q $setting /proc/net/netfilter/nf_log || setting=$alternative",
-		  '',
-		  "    if echo \$setting > $file; then",
-		  '       progress_message "Log Backend set to $setting"',
-		  '   else',
-		  '       error_message "WARNING: Unable to set log backend to $setting"',
-		  '   fi',
-		  'else',
-		  "    error_message 'WARNING: $file does not exist - log backend not set'",
-		  "fi\n"
-		);
-	} else {
-	    emit( "    if echo $setting > $file; then",
-		  "        progress_message 'Log Backend set to $setting'",
-		  '    else',
-		  "        error_message 'WARNING: Unable to set log backend to $setting'",
-		  '    fi',
-		  'else',
-		  "    error_message 'WARNING: $file does not exist - log backend not set'",
-		  "fi\n" );
-	}
+	      "if [ -f $file ]; then",
+	      "   if echo $setting > $file; then",
+	      "       progress_message 'Log Backend set to $setting'",
+	      '   else',
+	      "       error_message 'WARNING: Unable to set log backend to $setting'",
+	      '   fi',
+	      'else',
+	      "   error_message 'WARNING: $file does not exist - log backend not set'",
+	      "fi\n" );
     }
 }
 

Shorewall/Perl/lib.core

@@ -17,7 +17,7 @@
 #
 #	Options are:
 #
-#	    -n				  Do not alter Routing
+#	    -n				  Don't alter Routing
 #	    -v and -q			  Standard Shorewall Verbosity control
 #           -t                            Timestamp progress messages
 #           -p                            Purge conntrack table
@@ -587,7 +587,7 @@ debug_restore_input() {
     done
 }
 
-interface_enabled() {
+interface_up() {
     return $(cat ${VARDIR}/$1.status)
 }
 
@@ -604,7 +604,7 @@ distribute_load() {
     totalload=0
 
     for interface in $@; do
-	if interface_enabled $interface; then
+	if interface_up $interface; then
 	    load=$(cat ${VARDIR}/${interface}_load)
 	    eval ${interface}_load=$load
 	    mark=$(cat ${VARDIR}/${interface}_mark)
@@ -845,7 +845,6 @@ detect_dynamic_gateway() { # $1 = interface
     local GATEWAYS
     GATEWAYS=
     local gateway
-    local file
 
     gateway=$(run_findgw_exit $1);
 
@@ -853,21 +852,14 @@ detect_dynamic_gateway() { # $1 = interface
 	gateway=$( find_peer $($IP addr list $interface ) )
     fi
 
-    file="${VARLIB}/dhcpcd/dhcpcd-${1}.info"
-    if [ -z "$gateway" -a -f "${file}" ]; then
-	eval $(grep ^GATEWAYS= "${file}" 2> /dev/null)
+    if [ -z "$gateway" -a -f ${VARLIB}/dhcpcd/dhcpcd-${1}.info ]; then
+	eval $(grep ^GATEWAYS=  ${VARLIB}/dhcpcd/dhcpcd-${1}.info 2> /dev/null)
 	[ -n "$GATEWAYS" ] && GATEWAYS=${GATEWAYS%,*} && gateway=$GATEWAYS
     fi
 
-    for file in \
-	"${VARLIB}/dhcp/dhclient-${1}.lease" \
-	"${VARLIB}/dhcp/dhclient.${1}.leases"
-    do
-	[ -n "$gateway" ] && break
-	if [ -f "${file}" ]; then
-	    gateway=$(grep 'option routers' "${file}" | tail -n 1 | while read j1 j2 gateway; do echo "${gateway%\;}" ; return 0; done)
-	fi
-    done
+    if [ -z "$gateway" -a -f ${VARLIB}/dhcp/dhclient-${1}.lease ]; then
+	gateway=$(grep 'option routers' ${VARLIB}/dhcp/dhclient-${1}.lease | tail -n 1 | while read j1 j2 gateway; do echo $gateway ; return 0; done)
+    fi
 
     [ -n "$gateway" ] && echo $gateway
 }

Shorewall/Perl/prog.footer

@@ -29,7 +29,6 @@ usage() {
     echo "   -n               Don't update routing configuration"
     echo "   -p               Purge Conntrack Table"
     echo "   -t               Timestamp progress Messages"
-    echo "   -c               Save/restore iptables counters"
     echo "   -V <verbosity>   Set verbosity explicitly"
     echo "   -R <file>        Override RESTOREFILE setting"
     exit $1
@@ -87,17 +86,6 @@ g_purge=$PURGE
 g_noroutes=$NOROUTES
 g_timestamp=$TIMESTAMP
 g_recovering=$RECOVERING
-#
-# These two variables contain the high-order and low-order parts respectively of
-# an SHA1 digest of this file. The digest is generated before the two following
-# lines are updated to contain the value of that digest.
-#
-g_sha1sum1=
-g_sha1sum2=
-#
-# Other Globals
-#
-g_counters=
 
 initialize
 
@@ -149,10 +137,6 @@ while [ $finished -eq 0 -a $# -gt 0 ]; do
 			g_recovering=Yes
 			option=${option#r}
 			;;
-		    c*)
-			g_counters=Yes
-			option=${option#c}
-			;;
 		    V*)
 			option=${option#V}
 

Shorewall/Samples/Universal/interfaces

@@ -11,4 +11,4 @@
 ###############################################################################
 #ZONE	INTERFACE	OPTIONS
 -	lo		ignore
-net	all		dhcp,physical=+,routeback
+net	all		dhcp,physical=+,routeback,optional

Shorewall/helpers

@@ -58,14 +58,8 @@ loadmodule nf_nat_sip
 loadmodule nf_nat_snmp_basic
 loadmodule nf_nat_tftp
 #
-# While not actually helpers, these are included here so that
-# LOG_BACKEND can work correctly. Not all of them will be
-# loaded, since at least one of them will be an alias on any
-# given system.
+# While not actually helpers, these are handy to have
 #
-loadmodule ipt_LOG
-loadmodule nf_log_ipv4
-loadmodule xt_LOG
 loadmodule xt_NFLOG
-loadmodule ipt_ULOG
+loadmodule xt_ULOG
 loadmodule nfnetlink_log

Shorewall/init.fedora.sh

@@ -39,7 +39,7 @@ fi
 
 start() {
     echo -n $"Starting Shorewall: "
-    $shorewall $OPTIONS start $STARTOPTIONS 2>&1 | $logger
+    $shorewall $OPTIONS start 2>&1 | $logger
     retval=${PIPESTATUS[0]}
     if [[ $retval == 0 ]]; then
 	touch $lockfile
@@ -69,7 +69,7 @@ restart() {
 # Note that we don't simply stop and start since shorewall has a built in
 # restart which stops the firewall if running and then starts it.
     echo -n $"Restarting Shorewall: "
-    $shorewall $OPTIONS restart $RESTARTOPTIONS 2>&1 | $logger
+    $shorewall $OPTIONS restart 2>&1 | $logger
     retval=${PIPESTATUS[0]}
     if [[ $retval == 0 ]]; then
 	touch $lockfile

Shorewall/init.slackware.shorewall.sh

@@ -10,16 +10,15 @@
 
 OPTIONS=""
 
-# Use /etc/default shorewall to specify $OPTIONS and STARTOPTIONS to
-# run at startup, however this this might prevent shorewall from
-# starting. use at your own risk
+# Use /etc/default shorewall to specify $OPTIONS to run at startup, however this
+# this might prevent shorewall from starting. use at your own risk
 if [ -f /etc/default/shorewall ] ; then
     . /etc/default/shorewall
 fi
 
 start() {
 	echo "Starting IPv4 shorewall rules..."
-	exec /sbin/shorewall $OPTIONS start $STARTOPTIONS
+	exec /sbin/shorewall $OPTIONS start
 }
 
 stop() {
@@ -29,7 +28,7 @@ stop() {
 
 restart() {
 	echo "Restarting IPv4 shorewall rules..."
-	exec /sbin/shorewall restart $RESTARTOPTIONS
+	exec /sbin/shorewall restart
 }
 
 status() {

Shorewall/install.sh

@@ -332,7 +332,6 @@ if [ $PRODUCT = shorewall ]; then
 	if ! perl -e 'use Digest::SHA;' 2> /dev/null ; then
 	    if perl -e 'use Digest::SHA1;' 2> /dev/null ; then
 		sed -i 's/Digest::SHA/Digest::SHA1/' Perl/Shorewall/Chains.pm
-		sed -i 's/Digest::SHA/Digest::SHA1/' Perl/Shorewall/Config.pm
 		DIGEST=SHA1
 	    else
 		echo "ERROR: Shorewall $VERSION requires either Digest::SHA or Digest::SHA1" >&2
@@ -396,7 +395,7 @@ echo "$PRODUCT control program installed in ${DESTDIR}${SBINDIR}/$PRODUCT"
 #
 if [ -n "$INITFILE" ]; then
     if [ -f "${INITSOURCE}" ]; then
-	initfile="${DESTDIR}${INITDIR}/${INITFILE}"
+	initfile="${DESTDIR}/${INITDIR}/${INITFILE}"
 	install_file $INITSOURCE "$initfile" 0544
 
 	[ "${SHAREDIR}" = /usr/share ] || eval sed -i \'s\|/usr/share/\|${SHAREDIR}/\|\' "$initfile"
@@ -426,16 +425,12 @@ fi
 #
 # Install the .service file
 #
-if [ -z "${SERVICEDIR}" ]; then
-    SERVICEDIR="$SYSTEMD"
-fi
-
-if [ -n "$SERVICEDIR" ]; then
-    mkdir -p ${DESTDIR}${SERVICEDIR}
+if [ -n "$SYSTEMD" ]; then
+    mkdir -p ${DESTDIR}${SYSTEMD}
     [ -z "$SERVICEFILE" ] && SERVICEFILE=$PRODUCT.service
-    run_install $OWNERSHIP -m 644 $SERVICEFILE ${DESTDIR}${SERVICEDIR}/$PRODUCT.service
-    [ ${SBINDIR} != /sbin ] && eval sed -i \'s\|/sbin/\|${SBINDIR}/\|\' ${DESTDIR}${SERVICEDIR}/$PRODUCT.service
-    echo "Service file $SERVICEFILE installed as ${DESTDIR}${SERVICEDIR}/$PRODUCT.service"
+    run_install $OWNERSHIP -m 644 $SERVICEFILE ${DESTDIR}${SYSTEMD}/$PRODUCT.service
+    [ ${SBINDIR} != /sbin ] && eval sed -i \'s\|/sbin/\|${SBINDIR}/\|\' ${DESTDIR}${SYSTEMD}/$PRODUCT.service
+    echo "Service file $SERVICEFILE installed as ${DESTDIR}${SYSTEMD}/$PRODUCT.service"
 fi
 
 #
@@ -1181,7 +1176,7 @@ if [ -n "$SYSCONFFILE" -a -f "$SYSCONFFILE" -a ! -f ${DESTDIR}${SYSCONFDIR}/${PR
 fi
 
 if [ $configure -eq 1 -a -z "$DESTDIR" -a -n "$first_install" -a -z "${cygwin}${mac}" ]; then
-    if [ -n "$SERVICEDIR" ]; then
+    if [ -n "$SYSTEMD" ]; then
 	if systemctl enable ${PRODUCT}.service; then
 	    echo "$Product will start automatically at boot"
 	fi

Shorewall/lib.cli-std

@@ -534,10 +534,6 @@ start_command() {
 			    g_inline=Yes
 			    option=${option#i}
 			    ;;
-			C*)
-			    g_counters=Yes
-			    option=${option#C}
-			    ;;
 			*)
 			    usage 1
 			    ;;
@@ -574,14 +570,14 @@ start_command() {
     esac
 
     if [ -n "${g_fast}${AUTOMAKE}" ]; then
-	if [ -z "$g_fast" -o -z "${LEGACY_FASTSTART}${g_counters}" ]; then
+	if [ -z "$g_fast" -o -z "$LEGACY_FASTSTART" ]; then
 	    #
-	    # Automake or ( LEGACY_FASTSTART=No and not -C ) -- use the last compiled script
+	    # Automake or LEGACY_FASTSTART=No -- use the last compiled script
 	    #
 	    object=firewall
 	else
 	    #
-	    # 'start -f' with ( LEGACY_FASTSTART=Yes or -C ) -- use last saved configuration
+	    # 'start -f' with LEGACY_FASTSTART=Yes -- use last saved configuration
 	    #
 	    object=$RESTOREFILE
 	fi
@@ -947,10 +943,6 @@ restart_command() {
 			    g_inline=Yes
 			    option=${option#i}
 			    ;;
-			C*)
-			    g_counters=Yes
-			    option=${option#C}
-			    ;;
 			*)
 			    usage 1
 			    ;;
@@ -1681,12 +1673,12 @@ usage() # $1 = exit status
     echo "   reject <address> ..."
     echo "   reload [ -s ] [ -c ] [ -r <root user> ] [ -T ] [ -i ] [ <directory> ] <system>"
     echo "   reset [ <chain> ... ]"
-    echo "   restart [ -n ] [ -p ] [-d] [ -f ] [ -c ] [ -T ] [ -i ] [ -C ] [ <directory> ]"
-    echo "   restore [ -n ] [ -p ] [ -C ] [ <file name> ]"
+    echo "   restart [ -n ] [ -p ] [-d] [ -f ] [ -c ] [ -T ] [ -i ] [ <directory> ]"
+    echo "   restore [ -n ] [ <file name> ]"
     echo "   run <command> [ <parameter> ... ]"
     echo "   safe-restart [ -t <timeout> ] [ <directory> ]"
     echo "   safe-start [ -t <timeout> ] [ <directory> ]"
-    echo "   save [ -C ] [ <file name> ]"
+    echo "   save [ <file name> ]"
     echo "   [ show | list | ls ] [ -x ] [ -t {filter|mangle|nat|raw|rawpost} ] [ {chain [<chain> [ <chain> ... ]"
     echo "   [ show | list | ls ] actions"
     echo "   [ show | list | ls ] [ -x ] {bl|blacklists}"
@@ -1713,11 +1705,11 @@ usage() # $1 = exit status
     echo "   [ show | list | ls ] tc [ device ]"
     echo "   [ show | list | ls ] vardir"
     echo "   [ show | list | ls ] zones"
-    echo "   start [ -f ] [ -n ] [ -p ] [ -c ] [ -T ] [ -i ] [ -C ] [ <directory> ]"
+    echo "   start [ -f ] [ -n ] [ -p ] [ -c ] [ -T ] [ -i ] [ <directory> ]"
     echo "   status [ -i ]"
     echo "   stop"
     echo "   try <directory> [ <timeout> ]"
-    echo "   update [ -a ] [ -b ] [ -r ] [ -T ]  [ -D ] [ -i ] [-t] [-A] [ <directory> ]"
+    echo "   update [ -a ] [ -b ] [ -r ] [ -T ] [ -D ] [ -i ] [-t] [-A] [ <directory> ]"
     echo "   version [ -a ]"
     echo
     exit $1

Shorewall/manpages/shorewall-policy.xml

@@ -242,34 +242,13 @@
 
       <varlistentry>
         <term><emphasis role="bold">BURST:LIMIT</emphasis> (limit) -
-        [-|<replaceable>limit</replaceable>]</term>
+        [{<emphasis>s</emphasis>|<emphasis
+        role="bold">d</emphasis>}:[[<replaceable>name</replaceable>]:]]]<emphasis>rate</emphasis><emphasis
+        role="bold">/</emphasis>{<emphasis
+        role="bold">second</emphasis>|<emphasis
+        role="bold">minute</emphasis>}[:<emphasis>burst</emphasis>]</term>
 
         <listitem>
-          <para>where limit is one of:</para>
-
-          <simplelist>
-            <member>[<emphasis
-            role="bold">-</emphasis>|[{<emphasis>s</emphasis>|<emphasis
-            role="bold">d</emphasis>}:[[<replaceable>name</replaceable>]:]]]<emphasis>rate</emphasis><emphasis
-            role="bold">/</emphasis>{<emphasis
-            role="bold">sec</emphasis>|<emphasis
-            role="bold">min</emphasis>|<emphasis
-            role="bold">hour</emphasis>|<emphasis
-            role="bold">day</emphasis>}[:<emphasis>burst</emphasis>]</member>
-
-            <member>[<replaceable>name</replaceable>1]:<emphasis>rate1</emphasis><emphasis
-            role="bold">/</emphasis>{<emphasis
-            role="bold">sec</emphasis>|<emphasis
-            role="bold">min</emphasis>|<emphasis
-            role="bold">hour</emphasis>|<emphasis
-            role="bold">day</emphasis>}[:<emphasis>burst1</emphasis>],[<replaceable>name</replaceable>2]:<emphasis>rate2</emphasis><emphasis
-            role="bold">/</emphasis>{<emphasis
-            role="bold">sec</emphasis>|<emphasis
-            role="bold">min</emphasis>|<emphasis
-            role="bold">hour</emphasis>|<emphasis
-            role="bold">day</emphasis>}[:<emphasis>burst2</emphasis>]</member>
-          </simplelist>
-
           <para>If passed, specifies the maximum TCP connection
           <emphasis>rate</emphasis> and the size of an acceptable
           <emphasis>burst</emphasis>. If not specified, TCP connections are
@@ -282,19 +261,9 @@
           the user and specifies a hash table to be used to count matching
           connections. If not give, the name <emphasis
           role="bold">shorewall</emphasis> is assumed. Where more than one
-          POLICY or rule specifies the same name, the connections counts for
-          the policies are aggregated and the individual rates apply to the
+          POLICY specifies the same name, the connections counts for the
+          policies are aggregated and the individual rates apply to the
           aggregated count.</para>
-
-          <para>Beginning with Shorewall 4.6.5, two<replaceable>
-          limit</replaceable>s may be specified, separated by a comma. In this
-          case, the first limit (<replaceable>name1</replaceable>,
-          <replaceable>rate1</replaceable>, burst1) specifies the per-source
-          IP limit and the second limit specifies the per-destination IP
-          limit.</para>
-
-          <para>Example: <emphasis
-          role="bold">client:10/sec:20,:60/sec:100</emphasis></para>
         </listitem>
       </varlistentry>
 

Shorewall/manpages/shorewall-rules.xml

@@ -1001,7 +1001,7 @@
           role="bold">DNAT-</emphasis>, the connections will be assigned to
           addresses in the range in a round-robin fashion.</para>
 
-          <para>If your kernel and iptables have ipset match support then you
+          <para>If you kernel and iptables have ipset match support then you
           may give the name of an ipset prefaced by "+". The ipset name may be
           optionally followed by a number from 1 to 6 enclosed in square
           brackets ([]) to indicate the number of levels of destination
@@ -1226,41 +1226,22 @@
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis role="bold">RATE LIMIT</emphasis> (rate) -
-        <replaceable>limit</replaceable></term>
+        <term><emphasis role="bold">RATE LIMIT</emphasis> (rate) - [<emphasis
+        role="bold">-</emphasis>|[{<emphasis>s</emphasis>|<emphasis
+        role="bold">d</emphasis>}:[[<replaceable>name</replaceable>]:]]]<emphasis>rate</emphasis><emphasis
+        role="bold">/</emphasis>{<emphasis
+        role="bold">sec</emphasis>|<emphasis
+        role="bold">min</emphasis>|<emphasis
+        role="bold">hour</emphasis>|<emphasis
+        role="bold">day</emphasis>}[:<emphasis>burst</emphasis>]</term>
 
         <listitem>
-          <para>where <replaceable>limit</replaceable> is one of:</para>
-
-          <simplelist>
-            <member>[<emphasis
-            role="bold">-</emphasis>|[{<emphasis>s</emphasis>|<emphasis
-            role="bold">d</emphasis>}:[[<replaceable>name</replaceable>]:]]]<emphasis>rate</emphasis><emphasis
-            role="bold">/</emphasis>{<emphasis
-            role="bold">sec</emphasis>|<emphasis
-            role="bold">min</emphasis>|<emphasis
-            role="bold">hour</emphasis>|<emphasis
-            role="bold">day</emphasis>}[:<emphasis>burst</emphasis>]</member>
-
-            <member>[<replaceable>name</replaceable>1]:<emphasis>rate1</emphasis><emphasis
-            role="bold">/</emphasis>{<emphasis
-            role="bold">sec</emphasis>|<emphasis
-            role="bold">min</emphasis>|<emphasis
-            role="bold">hour</emphasis>|<emphasis
-            role="bold">day</emphasis>}[:<emphasis>burst1</emphasis>],[<replaceable>name</replaceable>2]:<emphasis>rate2</emphasis><emphasis
-            role="bold">/</emphasis>{<emphasis
-            role="bold">sec</emphasis>|<emphasis
-            role="bold">min</emphasis>|<emphasis
-            role="bold">hour</emphasis>|<emphasis
-            role="bold">day</emphasis>}[:<emphasis>burst2</emphasis>]</member>
-          </simplelist>
-
           <para>You may optionally rate-limit the rule by placing a value in
           this column:</para>
 
-          <para><emphasis>rate*</emphasis> is the number of connections per
+          <para><emphasis>rate</emphasis> is the number of connections per
           interval (<emphasis role="bold">sec</emphasis> or <emphasis
-          role="bold">min</emphasis>) and <emphasis>burst</emphasis>* is the
+          role="bold">min</emphasis>) and <emphasis>burst</emphasis> is the
           largest burst permitted. If no <emphasis>burst</emphasis> is given,
           a value of 5 is assumed. There may be no no white-space embedded in
           the specification.</para>
@@ -1269,28 +1250,15 @@
 
           <para>When <option>s:</option> or <option>d:</option> is specified,
           the rate applies per source IP address or per destination IP address
-          respectively. The <replaceable>name</replaceable>s may be chosen by
-          the user and specifiy a hash table to be used to count matching
+          respectively. The <replaceable>name</replaceable> may be chosen by
+          the user and specifies a hash table to be used to count matching
           connections. If not given, the name <emphasis
           role="bold">shorewallN</emphasis> (where N is a unique integer) is
-          assumed. Where more than one rule or POLICY specifies the same name,
-          the connections counts for the rules are aggregated and the
-          individual rates apply to the aggregated count.</para>
+          assumed. Where more than one rule specifies the same name, the
+          connections counts for the rules are aggregated and the individual
+          rates apply to the aggregated count.</para>
 
-          <para>Beginning with Shorewall 4.6.5, two<replaceable>
-          limit</replaceable>s may be specified, separated by a comma. In this
-          case, the first limit (<replaceable>name1</replaceable>,
-          <replaceable>rate1</replaceable>, burst1) specifies the per-source
-          IP limit and the second limit specifies the per-destination IP
-          limit.</para>
-
-          <para>Example: <emphasis
-          role="bold">client:10/sec:20,:60/sec:100</emphasis></para>
-
-          <para>In this example, the 'client' hash table will be used to
-          enforce the per-source limit and the compiler will pick a unique
-          name for the hash table that tracks the per-destination
-          limit.</para>
+          <para>Example: <emphasis role="bold">s:ssh:3/min:5</emphasis></para>
         </listitem>
       </varlistentry>
 

Shorewall/manpages/shorewall.xml

@@ -441,8 +441,6 @@
 
       <arg><option>-i</option></arg>
 
-      <arg><option>-C</option></arg>
-
       <arg><replaceable>directory</replaceable></arg>
     </cmdsynopsis>
 
@@ -454,8 +452,7 @@
 
       <arg>-<replaceable>options</replaceable></arg>
 
-      <arg
-      choice="plain"><option>restore</option><arg><option>-n</option></arg><arg><option>-p</option></arg><arg><option>-C</option></arg></arg>
+      <arg choice="plain"><option>restore</option></arg>
 
       <arg><replaceable>filename</replaceable></arg>
     </cmdsynopsis>
@@ -520,8 +517,7 @@
 
       <arg>-<replaceable>options</replaceable></arg>
 
-      <arg
-      choice="plain"><option>save</option><arg><option>-C</option></arg></arg>
+      <arg choice="plain"><option>save</option></arg>
 
       <arg choice="opt"><replaceable>filename</replaceable></arg>
     </cmdsynopsis>
@@ -675,8 +671,6 @@
 
       <arg><option>-T</option><arg><option>-i</option></arg></arg>
 
-      <arg><option>-C</option></arg>
-
       <arg><replaceable>directory</replaceable></arg>
     </cmdsynopsis>
 
@@ -774,7 +768,7 @@
     used for debugging. See <ulink
     url="/starting_and_stopping_shorewall.htm#Trace">http://www.shorewall.net/starting_and_stopping_shorewall.htm#Trace</ulink>.</para>
 
-    <para>The <option>nolock</option> option prevents the command from
+    <para>The nolock <option>option</option> prevents the command from
     attempting to acquire the Shorewall lockfile. It is useful if you need to
     include <command>shorewall</command> commands in
     <filename>/etc/shorewall/started</filename>.</para>
@@ -877,11 +871,10 @@
           and causes a Perl stack trace to be included with each
           compiler-generated error and warning message.</para>
 
-          <para>The <option>-i</option> option was added in Shorewall 4.6.0
-          and causes a warning message to be issued if the line current line
-          contains alternative input specifications following a semicolon
-          (";"). Such lines will be handled incorrectly if INLINE_MATCHES is
-          set to Yes in
+          <para>The -i option was added in Shorewall 4.6.0 and causes a
+          warning message to be issued if the line current line contains
+          alternative input specifications following a semicolon (";"). Such
+          lines will be handled incorrectly if INLINE_MATCHES is set to Yes in
           <ulink
           url="/manpages/shorewall.conf.html">shorewall.conf</ulink>(5).</para>
         </listitem>
@@ -921,17 +914,18 @@
           compile -- -</command>) to suppress the 'Compiling...' message
           normally generated by <filename>/sbin/shorewall</filename>.</para>
 
-          <para>When <option>-e</option> is specified, the compilation is being
-          performed on a system other than where the compiled script will run.
-          This option disables certain configuration options that require the
-          script to be compiled where it is to be run. The use of <option>-e</option>
-          requires the presence of a configuration file named <filename>capabilities</filename>
-          which may be produced using the command <command>shorewall-lite show -f
-          capabilities &gt; capabilities</command> on a system with Shorewall Lite
+          <para>When -e is specified, the compilation is being performed on a
+          system other than where the compiled script will run. This option
+          disables certain configuration options that require the script to be
+          compiled where it is to be run. The use of -e requires the presence
+          of a configuration file named <filename>capabilities</filename>
+          which may be produced using the command <emphasis
+          role="bold">shorewall-lite show -f capabilities &gt;
+          capabilities</emphasis> on a system with Shorewall Lite
           installed</para>
 
-          <para>The <option>-c</option> option was added in Shorewall 4.5.17
-          and causes conditional compilation of a script. The
+          <para>The <emphasis role="bold">-c</emphasis> option was added in
+          Shorewall 4.5.17 and causes conditional compilation of a script. The
           script specified by <replaceable>pathname</replaceable> (or implied
           if <emphasis role="bold">pathname</emphasis> is omitted) is compiled
           if it doesn't exist or if there is any file in the
@@ -951,8 +945,8 @@
           and causes a Perl stack trace to be included with each
           compiler-generated error and warning message.</para>
 
-          <para>The <option>-i</option> option was added in Shorewall 4.6.0 and
-          causes a warning message to be issued if the line current line contains
+          <para>The -i option was added in Shorewall 4.6.0 and causes a
+          warning message to be issued if the line current line contains
           alternative input specifications following a semicolon (";"). Such
           lines will be handled incorrectly if INLINE_MATCHES is set to Yes in
           <ulink
@@ -1021,10 +1015,9 @@
 
           <para>The <emphasis role="bold">-x</emphasis> option causes actual
           packet and byte counts to be displayed. Without that option, these
-          counts are abbreviated.</para>
-
-          <para>The <emphasis role="bold">-m</emphasis> option causes any MAC
-          addresses included in Shorewall log messages to be displayed.</para>
+          counts are abbreviated. The <emphasis role="bold">-m</emphasis>
+          option causes any MAC addresses included in Shorewall log messages
+          to be displayed.</para>
 
           <para>The <emphasis role="bold">-l</emphasis> option causes the rule
           number for each Netfilter rule to be displayed.</para>
@@ -1189,8 +1182,8 @@
           and causes a Perl stack trace to be included with each
           compiler-generated error and warning message.</para>
 
-          <para>The <option>-i</option> option was added in Shorewall 4.6.0 and
-          causes a warning message to be issued if the line current line contains
+          <para>The -i option was added in Shorewall 4.6.0 and causes a
+          warning message to be issued if the line current line contains
           alternative input specifications following a semicolon (";"). Such
           lines will be handled incorrectly if INLINE_MATCHES is set to Yes in
           <ulink
@@ -1275,21 +1268,21 @@
           <para>The <option>-n</option> option was added in Shorewall 4.5.3
           causes Shorewall to avoid updating the routing table(s).</para>
 
-          <para>The <option>-d</option> option was added in Shorewall 4.5.3
+          <para>The <option>-d </option>option was added in Shorewall 4.5.3
           causes the compiler to run under the Perl debugger.</para>
 
           <para>The <option>-T</option> option was added in Shorewall 4.5.3
           and causes a Perl stack trace to be included with each
           compiler-generated error and warning message.</para>
 
-          <para>The <option>-i</option> option was added in Shorewall 4.6.0
-          and causes a warning message to be issued if the line current line contains
+          <para>The -i option was added in Shorewall 4.6.0 and causes a
+          warning message to be issued if the line current line contains
           alternative input specifications following a semicolon (";"). Such
           lines will be handled incorrectly if INLINE_MATCHES is set to Yes in
           <ulink
           url="/manpages/shorewall.conf.html">shorewall.conf</ulink>(5).</para>
 
-          <para>The <option>-D</option> option was added in Shorewall 4.5.3
+          <para>The -<option>D</option> option was added in Shorewall 4.5.3
           and causes Shorewall to look in the given
           <emphasis>directory</emphasis> first for configuration files.</para>
 
@@ -1351,8 +1344,8 @@
           and causes a Perl stack trace to be included with each
           compiler-generated error and warning message.</para>
 
-          <para>The <option>-i</option> option was added in Shorewall 4.6.0
-          and causes a warning message to be issued if the line current line contains
+          <para>The -i option was added in Shorewall 4.6.0 and causes a
+          warning message to be issued if the line current line contains
           alternative input specifications following a semicolon (";"). Such
           lines will be handled incorrectly if INLINE_MATCHES is set to Yes in
           <ulink
@@ -1387,7 +1380,7 @@
           table to be flushed; the <command>conntrack</command> utility must
           be installed to use this option.</para>
 
-          <para>The <option>-d</option> option causes the compiler to run
+          <para>The <option>-d </option>option causes the compiler to run
           under the Perl debugger.</para>
 
           <para>The <option>-f</option> option suppresses the compilation step
@@ -1399,27 +1392,19 @@
           and performs the compilation step unconditionally, overriding the
           AUTOMAKE setting in <ulink
           url="/manpages/shorewall.conf.html">shorewall.conf</ulink>(5). When
-          both <option>-f</option> and <option>-c</option> are present, the
+          both <option>-f</option> and <option>-c</option>are present, the
           result is determined by the option that appears last.</para>
 
           <para>The <option>-T</option> option was added in Shorewall 4.5.3
           and causes a Perl stack trace to be included with each
           compiler-generated error and warning message.</para>
 
-          <para>The <option>-i</option> option was added in Shorewall 4.6.0
-          and causes a warning message to be issued if the line current line contains
+          <para>The -i option was added in Shorewall 4.6.0 and causes a
+          warning message to be issued if the line current line contains
           alternative input specifications following a semicolon (";"). Such
           lines will be handled incorrectly if INLINE_MATCHES is set to Yes in
           <ulink
           url="/manpages/shorewall.conf.html">shorewall.conf</ulink>(5).</para>
-
-          <para>The <option>-C</option> option was added in Shorewall 4.6.5
-          and is only meaningful when AUTOMAKE=Yes in <ulink
-          url="/manpages/shorewall.conf.html">shorewall.conf</ulink>(5). If an
-          existing firewall script is used and if that script was the one that
-          generated the current running configuration, then the running
-          netfilter configuration will be reloaded as is so as to preserve the
-          iptables packet and byte counters.</para>
         </listitem>
       </varlistentry>
 
@@ -1435,27 +1420,6 @@
           <emphasis>filename</emphasis> is given then Shorewall will be
           restored from the file specified by the RESTOREFILE option in <ulink
           url="/manpages/shorewall.conf.html">shorewall.conf</ulink>(5).</para>
-
-          <caution>
-            <para>If your iptables ruleset depends on variables that are
-            detected at run-time, either in your params file or by
-            Shorewall-generated code, <command>restore</command> will use the
-            values that were current when the ruleset was saved, which may be
-            different from the current values.</para>
-          </caution>
-
-          <para>The <option>-n</option> option causes Shorewall to avoid
-          updating the routing table(s).</para>
-
-          <para>The <option>-p</option> option, added in Shorewall 4.6.5,
-          causes the connection tracking table to be flushed; the
-          <command>conntrack</command> utility must be installed to use this
-          option.</para>
-
-          <para>The <option>-C</option> option was added in Shorewall 4.6.5.
-          If the <option>-C</option> option was specified during <emphasis
-          role="bold">shorewall save</emphasis>, then the counters saved by
-          that operation will be restored.</para>
         </listitem>
       </varlistentry>
 
@@ -1544,10 +1508,6 @@
           <emphasis>filename</emphasis> is not given then the state is saved
           in the file specified by the RESTOREFILE option in <ulink
           url="/manpages/shorewall.conf.html">shorewall.conf</ulink>(5).</para>
-
-          <para>The <option>-C</option> option, added in Shorewall 4.6.5,
-          causes the iptables packet and byte counters to be saved along with
-          the chains and rules.</para>
         </listitem>
       </varlistentry>
 
@@ -1574,7 +1534,7 @@
               <listitem>
                 <para>Added in Shorewall 4.6.2. Displays the dynamic chain
                 along with any chains produced by entries in
-                shorewall-blrules(5). The <emphasis role="bold">-x</emphasis>
+                shorewall-blrules(5).The <emphasis role="bold">-x</emphasis>
                 option is passed directly through to iptables and causes
                 actual packet and byte counts to be displayed. Without this
                 option, those counts are abbreviated.</para>
@@ -1740,7 +1700,7 @@
 
               <listitem>
                 <para>Displays the Netfilter nat table using the command
-                <emphasis role="bold">iptables -t nat -L -n -v</emphasis>. The
+                <emphasis role="bold">iptables -t nat -L -n -v</emphasis>.The
                 <emphasis role="bold">-x</emphasis> option is passed directly
                 through to iptables and causes actual packet and byte counts
                 to be displayed. Without this option, those counts are
@@ -1773,7 +1733,7 @@
 
               <listitem>
                 <para>Displays the Netfilter raw table using the command
-                <emphasis role="bold">iptables -t raw -L -n -v</emphasis>. The
+                <emphasis role="bold">iptables -t raw -L -n -v</emphasis>.The
                 <emphasis role="bold">-x</emphasis> option is passed directly
                 through to iptables and causes actual packet and byte counts
                 to be displayed. Without this option, those counts are
@@ -1852,13 +1812,6 @@
           lines will be handled incorrectly if INLINE_MATCHES is set to Yes in
           <ulink
           url="/manpages/shorewall.conf.html">shorewall.conf(5)</ulink>.</para>
-
-          <para>The <option>-C</option> option was added in Shorewall 4.6.5
-          and is only meaningful when the <option>-f</option> option is also
-          specified. If the previously-saved configuration is restored, and if
-          the <option>-C</option> option was also specified in the <emphasis
-          role="bold">save</emphasis> command, then the packet and byte
-          counters will be restored.</para>
         </listitem>
       </varlistentry>
 

Shorewall/modules.essential

@@ -28,3 +28,4 @@ loadmodule iptable_nat
 loadmodule iptable_raw
 loadmodule xt_state
 loadmodule xt_tcpudp
+loadmodule ipt_LOG

Shorewall/modules.extensions

@@ -32,6 +32,7 @@ loadmodule ipt_ipp2p
 loadmodule ipt_iprange
 loadmodule ipt_length
 loadmodule ipt_limit
+loadmodule ipt_LOG
 loadmodule ipt_mac
 loadmodule ipt_mark
 loadmodule ipt_MARK
@@ -57,3 +58,4 @@ loadmodule ipt_tos
 loadmodule ipt_TOS
 loadmodule ipt_ttl
 loadmodule ipt_TTL
+loadmodule ipt_ULOG

Shorewall/modules.xtables

@@ -31,6 +31,7 @@ loadmodule xt_mac
 loadmodule xt_mark
 loadmodule xt_MARK
 loadmodule xt_multiport
+loadmodule xt_NFLOG
 loadmodule xt_NFQUEUE
 loadmodule xt_owner
 loadmodule xt_physdev

Shorewall/shorewall.service

@@ -13,7 +13,7 @@ Type=oneshot
 RemainAfterExit=yes
 EnvironmentFile=-/etc/sysconfig/shorewall
 StandardOutput=syslog
-ExecStart=/sbin/shorewall $OPTIONS start $STARTOPTIONS
+ExecStart=/sbin/shorewall $OPTIONS start
 ExecStop=/sbin/shorewall $OPTIONS stop
 
 [Install]

Shorewall/shorewall.service.214

@@ -1,20 +0,0 @@
-#
-#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall
-#
-#     Copyright 2011 Jonathan Underwood <jonathan.underwood@gmail.com>
-#
-[Unit]
-Description=Shorewall IPv4 firewall
-After=network-online.target
-Conflicts=iptables.service firewalld.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=-/etc/sysconfig/shorewall
-StandardOutput=syslog
-ExecStart=/sbin/shorewall $OPTIONS start $STARTOPTIONS
-ExecStop=/sbin/shorewall $OPTIONS stop
-
-[Install]
-WantedBy=basic.target

Shorewall6-lite/init.fedora.sh

@@ -39,7 +39,7 @@ fi
 
 start() {
     echo -n $"Starting Shorewall: "
-    $shorewall $OPTIONS start $STARTOPTIONS 2>&1 | $logger
+    $shorewall $OPTIONS start 2>&1 | $logger
     retval=${PIPESTATUS[0]}
     if [[ $retval == 0 ]]; then
 	touch $lockfile
@@ -69,7 +69,7 @@ restart() {
 # Note that we don't simply stop and start since shorewall has a built in
 # restart which stops the firewall if running and then starts it.
     echo -n $"Restarting Shorewall: "
-    $shorewall $OPTIONS restart $RESTARTOPTIONS 2>&1 | $logger
+    $shorewall $OPTIONS restart 2>&1 | $logger
     retval=${PIPESTATUS[0]}
     if [[ $retval == 0 ]]; then
 	touch $lockfile

Shorewall6-lite/manpages/shorewall6-lite.xml

@@ -301,8 +301,6 @@
 
       <arg><option>-p</option></arg>
 
-      <arg><option>-C</option></arg>
-
       <arg><replaceable>directory</replaceable></arg>
     </cmdsynopsis>
 
@@ -316,8 +314,6 @@
 
       <arg choice="plain"><option>restore</option></arg>
 
-      <arg><option>-C</option></arg>
-
       <arg><replaceable>filename</replaceable></arg>
     </cmdsynopsis>
 
@@ -346,8 +342,6 @@
 
       <arg choice="plain"><option>save</option></arg>
 
-      <arg><option>-C</option></arg>
-
       <arg choice="opt"><replaceable>filename</replaceable></arg>
     </cmdsynopsis>
 
@@ -480,10 +474,6 @@
       <arg><option>-n</option></arg>
 
       <arg><option>-p</option></arg>
-
-      <arg><option>-f</option></arg>
-
-      <arg><option>-C</option></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
@@ -534,11 +524,10 @@
     used for debugging. See <ulink
     url="http://www.shorewall.net/starting_and_stopping_shorewall.htm#Trace">http://www.shorewall.net/starting_and_stopping_shorewall.htm#Trace</ulink>.</para>
 
-    <para>The <option>nolock</option> option prevents the command from
+    <para>The nolock <option>option</option> prevents the command from
     attempting to acquire the shorewall6-lite lockfile. It is useful if you
-    need to include <command>shorewall</command> commands in the
-    <filename>started</filename> <ulink
-    url="../shorewall_extension_scripts.html">extension script</ulink>.</para>
+    need to include <command>shorewall</command> commands in
+    <filename>/etc/shorewall/started</filename>.</para>
 
     <para>The <emphasis>options</emphasis> control the amount of output that
     the command produces. They consist of a sequence of the letters <emphasis
@@ -549,8 +538,8 @@
     role="bold">v</emphasis> adds one to the effective verbosity and each
     <emphasis role="bold">q</emphasis> subtracts one from the effective
     VERBOSITY. Alternately, <emphasis role="bold">v</emphasis> may be followed
-    immediately with one of -1,0,1,2 to specify VERBOSITY. There may be no
-    white-space between <emphasis role="bold">v</emphasis> and the
+    immediately with one of -1,0,1,2 to specify a specify VERBOSITY. There may
+    be no white-space between <emphasis role="bold">v</emphasis> and the
     VERBOSITY.</para>
 
     <para>The <emphasis>options</emphasis> may also include the letter
@@ -571,21 +560,19 @@
           <para>Adds a list of hosts or subnets to a dynamic zone usually used
           with VPN's.</para>
 
-          <para>The <replaceable>interface</replaceable> argument names an
-          interface defined in the <ulink
+          <para>The <emphasis>interface</emphasis> argument names an interface
+          defined in the <ulink
           url="shorewall-interfaces.html">shorewall-interfaces</ulink>(5)
-          file. A <replaceable>host-list</replaceable> is comma-separated list
-          whose elements are host or network addresses.</para>
-
-          <caution>
-            <para>The <command>add</command> command is not very robust. If
-            there are errors in the <replaceable>host-list</replaceable>, you
-            may see a large number of error messages yet a subsequent
-            <command>shorewall6-lite show zones</command> command will
-            indicate that all hosts were added. If this happens, replace
-            <command>add</command> by <command>delete</command> and run the
-            same command again. Then enter the correct command.</para>
-          </caution>
+          file. A <emphasis>host-list</emphasis> is comma-separated list whose
+          elements are host or network addresses.<caution>
+              <para>The <command>add</command> command is not very robust. If
+              there are errors in the <replaceable>host-list</replaceable>,
+              you may see a large number of error messages yet a subsequent
+              <command>shorewall6-lite show zones</command> command will
+              indicate that all hosts were added. If this happens, replace
+              <command>add</command> by <command>delete</command> and run the
+              same command again. Then enter the correct command.</para>
+            </caution></para>
         </listitem>
       </varlistentry>
 
@@ -594,9 +581,10 @@
 
         <listitem>
           <para>Re-enables receipt of packets from hosts previously
-          blacklisted by a <command>drop</command>,
-          <command>logdrop</command>, <command>reject</command>, or
-          <command>logreject</command> command.</para>
+          blacklisted by a <emphasis role="bold">drop</emphasis>, <emphasis
+          role="bold">logdrop</emphasis>, <emphasis
+          role="bold">reject</emphasis>, or <emphasis
+          role="bold">logreject</emphasis> command.</para>
         </listitem>
       </varlistentry>
 
@@ -610,9 +598,10 @@
           the firewall is causing connection problems.</para>
 
           <para>If <option>-f</option> is given, the command will be processed
-          by the compiled script that executed the last successful
-          <command>start</command>, <command>restart</command> or
-          <command>refresh</command> command if that script exists.</para>
+          by the compiled script that executed the last successful <emphasis
+          role="bold">start</emphasis>, <emphasis
+          role="bold">restart</emphasis> or <emphasis
+          role="bold">refresh</emphasis> command if that script exists.</para>
         </listitem>
       </varlistentry>
 
@@ -620,14 +609,14 @@
         <term><emphasis role="bold">delete</emphasis></term>
 
         <listitem>
-          <para>The delete command reverses the effect of an earlier
-          <command>add</command> command.</para>
+          <para>The delete command reverses the effect of an earlier <emphasis
+          role="bold">add</emphasis> command.</para>
 
-          <para>The <replaceable>interface</replaceable> argument names an
-          interface defined in the <ulink
+          <para>The <emphasis>interface</emphasis> argument names an interface
+          defined in the <ulink
           url="shorewall-interfaces.html">shorewall-interfaces</ulink>(5)
-          file. A <replaceable>host-list</replaceable> is comma-separated list
-          whose elements are a host or network address.</para>
+          file. A <emphasis>host-list</emphasis> is comma-separated list whose
+          elements are a host or network address.</para>
         </listitem>
       </varlistentry>
 
@@ -647,8 +636,8 @@
         <term><emphasis role="bold">drop</emphasis></term>
 
         <listitem>
-          <para>Causes traffic from the listed
-          <replaceable>address</replaceable>es to be silently dropped.</para>
+          <para>Causes traffic from the listed <emphasis>address</emphasis>es
+          to be silently dropped.</para>
         </listitem>
       </varlistentry>
 
@@ -659,15 +648,14 @@
           <para>Produces a verbose report about the firewall configuration for
           the purpose of problem analysis.</para>
 
-          <para>The <option>-x</option> option causes actual packet and byte
-          counts to be displayed. Without that option, these counts are
-          abbreviated.</para>
+          <para>The <emphasis role="bold">-x</emphasis> option causes actual
+          packet and byte counts to be displayed. Without that option, these
+          counts are abbreviated. The <emphasis role="bold">-m</emphasis>
+          option causes any MAC addresses included in shorewall6-lite log
+          messages to be displayed.</para>
 
-          <para>The <option>-m</option> option causes any MAC addresses
-          included in shorewall6-lite log messages to be displayed.</para>
-
-          <para>The <option>-l</option> option causes the rule number for each
-          Netfilter rule to be displayed.</para>
+          <para>The <emphasis role="bold">-l</emphasis> option causes the rule
+          number for each Netfilter rule to be displayed.</para>
         </listitem>
       </varlistentry>
 
@@ -687,11 +675,10 @@
         <term><emphasis role="bold">forget</emphasis></term>
 
         <listitem>
-          <para>Deletes
-          <filename>/var/lib/shorewall6-lite/<replaceable>filename</replaceable></filename>
-          and <filename>/var/lib/shorewall6-lite/save</filename>. If no
-          <replaceable>filename</replaceable> is given then the file specified
-          by RESTOREFILE in <ulink
+          <para>Deletes /var/lib/shorewall6-lite/<emphasis>filename</emphasis>
+          and /var/lib/shorewall6-lite/save. If no
+          <emphasis>filename</emphasis> is given then the file specified by
+          RESTOREFILE in <ulink
           url="shorewall.conf.html">shorewall6.conf</ulink>(5) is
           assumed.</para>
         </listitem>
@@ -757,11 +744,10 @@
         <term><emphasis role="bold">logdrop</emphasis></term>
 
         <listitem>
-          <para>Causes traffic from the listed
-          <replaceable>address</replaceable>es to be logged then discarded.
-          Logging occurs at the log level specified by the BLACKLIST_LOGLEVEL
-          setting in <ulink url="shorewall.conf.html">shorewall6.conf</ulink>
-          (5).</para>
+          <para>Causes traffic from the listed <emphasis>address</emphasis>es
+          to be logged then discarded. Logging occurs at the log level
+          specified by the BLACKLIST_LOGLEVEL setting in <ulink
+          url="shorewall.conf.html">shorewall6.conf</ulink> (5).</para>
         </listitem>
       </varlistentry>
 
@@ -772,18 +758,15 @@
           <para>Monitors the log file specified by the LOGFILE option in
           <ulink url="shorewall.conf.html">shorewall6.conf</ulink>(5) and
           produces an audible alarm when new shorewall6-lite messages are
-          logged.</para>
-
-          <para>The <option>-m</option> option causes the MAC address of each
-          packet source to be displayed if that information is
-          available.</para>
-
-          <para>The <replaceable>refresh-interval</replaceable> specifies the
-          time in seconds between screen refreshes. You can enter a negative
-          number by preceding the number with "--" (e.g.,
-          <command>shorewall6-lite logwatch -- -30</command>). In this case,
-          when a packet count changes, you will be prompted to hit any key to
-          resume screen refreshes.</para>
+          logged. The <emphasis role="bold">-m</emphasis> option causes the
+          MAC address of each packet source to be displayed if that
+          information is available. The
+          <replaceable>refresh-interval</replaceable> specifies the time in
+          seconds between screen refreshes. You can enter a negative number by
+          preceding the number with "--" (e.g., <command>shorewall6-lite
+          logwatch -- -30</command>). In this case, when a packet count
+          changes, you will be prompted to hit any key to resume screen
+          refreshes.</para>
         </listitem>
       </varlistentry>
 
@@ -791,11 +774,10 @@
         <term><emphasis role="bold">logreject</emphasis></term>
 
         <listitem>
-          <para>Causes traffic from the listed
-          <replaceable>address</replaceable>es to be logged then rejected.
-          Logging occurs at the log level specified by the BLACKLIST_LOGLEVEL
-          setting in <ulink url="shorewall.conf.html">shorewall6.conf</ulink>
-          (5).</para>
+          <para>Causes traffic from the listed <emphasis>address</emphasis>es
+          to be logged then rejected. Logging occurs at the log level
+          specified by the BLACKLIST_LOGLEVEL setting in <ulink
+          url="shorewall.conf.html">shorewall6.conf</ulink> (5).</para>
         </listitem>
       </varlistentry>
 
@@ -825,17 +807,9 @@
         <term><emphasis role="bold">restart</emphasis></term>
 
         <listitem>
-          <para>Restart is similar to <command>shorewall6-lite start</command>
-          except that it assumes that the firewall is already started.
-          Existing connections are maintained.</para>
-
-          <caution>
-            <para>If your ip6tables ruleset depends on variables that are
-            detected at run-time, either in your params file or by
-            Shorewall-generated code, <command>restore</command> will use the
-            values that were current when the ruleset was saved, which may be
-            different from the current values.</para>
-          </caution>
+          <para>Restart is similar to <emphasis role="bold">shorewall6-lite
+          start</emphasis> except that it assumes that the firewall is already
+          started. Existing connections are maintained.</para>
 
           <para>The <option>-n</option> option causes shorewall6-lite to avoid
           updating the routing table(s).</para>
@@ -843,12 +817,6 @@
           <para>The <option>-p</option> option causes the connection tracking
           table to be flushed; the <command>conntrack</command> utility must
           be installed to use this option.</para>
-
-          <para>The <option>-C</option> option was added in Shorewall 4.6.5.
-          If the specified (or implicit) firewall script is the one that
-          generated the current running configuration, then the running
-          netfilter configuration will be reloaded as is so as to preserve the
-          iptables packet and byte counters.</para>
         </listitem>
       </varlistentry>
 
@@ -856,21 +824,14 @@
         <term><emphasis role="bold">restore</emphasis></term>
 
         <listitem>
-          <para>Restore shorewall6-lite to a state saved using the
-          <command>shorewall6-lite save</command> command. Existing
-          connections are maintained. The <replaceable>filename</replaceable>
-          names a restore file in <filename
-          class="directory">/var/lib/shorewall6-lite</filename> created using
-          <command>shorewall6-lite save</command>; if no
-          <replaceable>filename</replaceable> is given then shorewall6-lite
-          will be restored from the file specified by the RESTOREFILE option
-          in <ulink
+          <para>Restore shorewall6-lite to a state saved using the <emphasis
+          role="bold">shorewall6-lite save</emphasis> command. Existing
+          connections are maintained. The <emphasis>filename</emphasis> names
+          a restore file in /var/lib/shorewall6-lite created using <emphasis
+          role="bold">shorewall6-lite save</emphasis>; if no
+          <emphasis>filename</emphasis> is given then shorewall6-lite will be
+          restored from the file specified by the RESTOREFILE option in <ulink
           url="shorewall.conf.html">shorewall6.conf</ulink>(5).</para>
-
-          <para>The <option>-C</option> option was added in Shorewall 4.6.5.
-          If the <option>-C</option> option was specified during
-          <command>shorewall7-lite save</command>, then the counters saved by
-          that operation will be restored.</para>
         </listitem>
       </varlistentry>
 
@@ -896,17 +857,12 @@
 
         <listitem>
           <para>The dynamic blacklist is stored in
-          <filename>/var/lib/shorewall6-lite/save</filename>. The state of the
-          firewall is stored in
-          <filename>/var/lib/shorewall6-lite/<replaceable>filename</replaceable></filename>
-          for use by the <command>shorewall6-lite restore</command> command.
-          If <replaceable>filename</replaceable> is not given then the state
-          is saved in the file specified by the RESTOREFILE option in <ulink
+          /var/lib/shorewall6-lite/save. The state of the firewall is stored
+          in /var/lib/shorewall6-lite/<emphasis>filename</emphasis> for use by
+          the <emphasis role="bold">shorewall6-lite restore</emphasis>. If
+          <emphasis>filename</emphasis> is not given then the state is saved
+          in the file specified by the RESTOREFILE option in <ulink
           url="shorewall.conf.html">shorewall6.conf</ulink>(5).</para>
-
-          <para>The <option>-C</option> option, added in Shorewall 4.6.5,
-          causes the ip6tables packet and byte counters to be saved along with
-          the chains and rules.</para>
         </listitem>
       </varlistentry>
 
@@ -924,10 +880,10 @@
               <listitem>
                 <para>Added in Shorewall 4.6.2. Displays the dynamic chain
                 along with any chains produced by entries in
-                shorewall6-blrules(5).The <option>-x</option> option is passed
-                directly through to ip6tables and causes actual packet and
-                byte counts to be displayed. Without this option, those counts
-                are abbreviated.</para>
+                shorewall6-blrules(5).The <emphasis role="bold">-x</emphasis>
+                option is passed directly through to ip6tables and causes
+                actual packet and byte counts to be displayed. Without this
+                option, those counts are abbreviated.</para>
               </listitem>
             </varlistentry>
 
@@ -936,9 +892,9 @@
 
               <listitem>
                 <para>Displays your kernel/iptables capabilities. The
-                <option>-f</option> option causes the display to be formatted
-                as a capabilities file for use with <command>compile
-                -e</command>.</para>
+                <emphasis role="bold">-f</emphasis> option causes the display
+                to be formatted as a capabilities file for use with <emphasis
+                role="bold">compile -e</emphasis>.</para>
               </listitem>
             </varlistentry>
 
@@ -952,26 +908,25 @@
                 -L</emphasis> <emphasis>chain</emphasis> <emphasis
                 role="bold">-n -v</emphasis> command. If no
                 <emphasis>chain</emphasis> is given, all of the chains in the
-                filter table are displayed.</para>
-
-                <para>The <option>-x</option> option is passed directly
-                through to iptables and causes actual packet and byte counts
-                to be displayed. Without this option, those counts are
-                abbreviated.</para>
-
-                <para>The <option>-t</option> option specifies the Netfilter
-                table to display. The default is <emphasis
+                filter table are displayed. The <emphasis
+                role="bold">-x</emphasis> option is passed directly through to
+                iptables and causes actual packet and byte counts to be
+                displayed. Without this option, those counts are abbreviated.
+                The <emphasis role="bold">-t</emphasis> option specifies the
+                Netfilter table to display. The default is <emphasis
                 role="bold">filter</emphasis>.</para>
 
-                <para>The <option>-b</option> ('brief') option causes rules
-                which have not been used (i.e. which have zero packet and byte
-                counts) to be omitted from the output. Chains with no rules
-                displayed are also omitted from the output.</para>
+                <para>The <emphasis role="bold">-b</emphasis> ('brief') option
+                causes rules which have not been used (i.e. which have zero
+                packet and byte counts) to be omitted from the output. Chains
+                with no rules displayed are also omitted from the
+                output.</para>
 
-                <para>The <option>-l</option> option causes the rule number
-                for each Netfilter rule to be displayed.</para>
+                <para>The <emphasis role="bold">-l</emphasis> option causes
+                the rule number for each Netfilter rule to be
+                displayed.</para>
 
-                <para>If the <option>-t</option> option and the
+                <para>If the <emphasis role="bold">t</emphasis> option and the
                 <option>chain</option> keyword are both omitted and any of the
                 listed <replaceable>chain</replaceable>s do not exist, a usage
                 message is displayed.</para>
@@ -1049,11 +1004,10 @@
               <listitem>
                 <para>Displays the last 20 shorewall6-lite messages from the
                 log file specified by the LOGFILE option in <ulink
-                url="shorewall.conf.html">shorewall6.conf</ulink>(5).</para>
-
-                <para>The <option>-m</option> option causes the MAC address of
-                each packet source to be displayed if that information is
-                available.</para>
+                url="shorewall.conf.html">shorewall6.conf</ulink>(5). The
+                <emphasis role="bold">-m</emphasis> option causes the MAC
+                address of each packet source to be displayed if that
+                information is available.</para>
               </listitem>
             </varlistentry>
 
@@ -1072,10 +1026,10 @@
 
               <listitem>
                 <para>Displays the Netfilter nat table using the command
-                <command>iptables -t nat -L -n -v</command>.The
-                <option>-x</option> option is passed directly through to
-                iptables and causes actual packet and byte counts to be
-                displayed. Without this option, those counts are
+                <emphasis role="bold">iptables -t nat -L -n -v</emphasis>.The
+                <emphasis role="bold">-x</emphasis> option is passed directly
+                through to iptables and causes actual packet and byte counts
+                to be displayed. Without this option, those counts are
                 abbreviated.</para>
               </listitem>
             </varlistentry>
@@ -1105,10 +1059,10 @@
 
               <listitem>
                 <para>Displays the Netfilter raw table using the command
-                <command>iptables -t raw -L -n -v</command>.The
-                <option>-x</option> option is passed directly through to
-                iptables and causes actual packet and byte counts to be
-                displayed. Without this option, those counts are
+                <emphasis role="bold">iptables -t raw -L -n -v</emphasis>.The
+                <emphasis role="bold">-x</emphasis> option is passed directly
+                through to iptables and causes actual packet and byte counts
+                to be displayed. Without this option, those counts are
                 abbreviated.</para>
               </listitem>
             </varlistentry>
@@ -1138,7 +1092,7 @@
         <term><emphasis role="bold">start</emphasis></term>
 
         <listitem>
-          <para>Start Shorewall6 Lite. Existing connections through
+          <para>Start Shorewall Lite. Existing connections through
           shorewall6-lite managed interfaces are untouched. New connections
           will be allowed only if they are allowed by the firewall rules or
           policies.</para>
@@ -1146,22 +1100,6 @@
           <para>The <option>-p</option> option causes the connection tracking
           table to be flushed; the <command>conntrack</command> utility must
           be installed to use this option.</para>
-
-          <para>The <option>-m</option> option prevents the firewall script
-          from modifying the current routing configuration.</para>
-
-          <para>The <option>-f</option> option was added in Shorewall 4.6.5.
-          If the RESTOREFILE named in <ulink
-          url="shorewall.conf.html">shorewall.conf</ulink>(5) exists, is
-          executable and is not older than the current filewall script, then
-          that saved configuration is restored.</para>
-
-          <para>The <option>-C</option> option was added in Shorewall 4.6.5
-          and is only meaningful when the <option>-f</option> option is also
-          specified. If the previously-saved configuration is restored, and if
-          the <option>-C</option> option was also specified in the
-          <command>save</command> command, then the packet and byte counters
-          will be restored.</para>
         </listitem>
       </varlistentry>
 
@@ -1180,9 +1118,10 @@
           or by ADMINISABSENTMINDED.</para>
 
           <para>If <option>-f</option> is given, the command will be processed
-          by the compiled script that executed the last successful
-          <command>start</command>, <command>restart</command> or
-          <command>refresh</command> command if that script exists.</para>
+          by the compiled script that executed the last successful <emphasis
+          role="bold">start</emphasis>, <emphasis
+          role="bold">restart</emphasis> or <emphasis
+          role="bold">refresh</emphasis> command if that script exists.</para>
         </listitem>
       </varlistentry>
 
@@ -1193,7 +1132,7 @@
           <para>Produces a short report about the state of the
           Shorewall-configured firewall.</para>
 
-          <para>The <option>-i</option> option was added in Shorewall 4.6.2
+          <para>The <option>-i </option>option was added in Shorewall 4.6.2
           and causes the status of each optional or provider interface to be
           displayed.</para>
         </listitem>

Shorewall6-lite/shorewall6-lite.service

@@ -13,7 +13,7 @@ Type=oneshot
 RemainAfterExit=yes
 EnvironmentFile=-/etc/sysconfig/shorewall6-lite
 StandardOutput=syslog
-ExecStart=/sbin/shorewall6-lite $OPTIONS start $STARTOPTIONS
+ExecStart=/sbin/shorewall6-lite $OPTIONS start
 ExecStop=/sbin/shorewall6-lite $OPTIONS stop
 
 [Install]

Shorewall6-lite/shorewall6-lite.service.214

@@ -1,20 +0,0 @@
-#
-#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall
-#
-#     Copyright 2011 Jonathan Underwood <jonathan.underwood@gmail.com>
-#
-[Unit]
-Description=Shorewall IPv6 firewall (lite)
-After=network-online.target
-Conflicts=ip6tables.service firewalld.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=-/etc/sysconfig/shorewall6-lite
-StandardOutput=syslog
-ExecStart=/sbin/shorewall6-lite $OPTIONS start
-ExecStop=/sbin/shorewall6-lite $OPTIONS stop
-
-[Install]
-WantedBy=basic.target

Shorewall6/helpers

@@ -35,13 +35,7 @@ loadmodule nf_conntrack_sip
 loadmodule nf_conntrack_tftp
 loadmodule nf_conntrack_sane
 #
-# While not actually helpers, these are included here so that
-# LOG_BACKEND can work correctly. Not all of them will be
-# loaded, since at least one of them will be an alias on any
-# given system.
+# While not actually helpers, these are handy to have
 #
-loadmodule ip6t_LOG
-loadmodule nf_log_ipv6
-loadmodule xt_LOG
 loadmodule xt_NFLOG
 loadmodule nfnetlink_log

Shorewall6/init.fedora.sh

@@ -39,7 +39,7 @@ fi
 
 start() {
     echo -n $"Starting Shorewall: "
-    $shorewall $OPTIONS start $STARTOPTIONS 2>&1 | $logger
+    $shorewall $OPTIONS start 2>&1 | $logger
     retval=${PIPESTATUS[0]}
     if [[ $retval == 0 ]]; then
 	touch $lockfile
@@ -69,7 +69,7 @@ restart() {
 # Note that we don't simply stop and start since shorewall has a built in
 # restart which stops the firewall if running and then starts it.
     echo -n $"Restarting Shorewall: "
-    $shorewall $OPTIONS restart $RESTARTOPTIONS 2>&1 | $logger
+    $shorewall $OPTIONS restart 2>&1 | $logger
     retval=${PIPESTATUS[0]}
     if [[ $retval == 0 ]]; then
 	touch $lockfile

Shorewall6/init.slackware.shorewall6.sh

@@ -10,9 +10,8 @@
 
 OPTIONS=""
 
-# Use /etc/default shorewall6 to specify $OPTIONS and STARTOPTIONS to
-# run at startup, however this this might prevent shorewall6 from
-# starting. use at your own risk
+# Use /etc/default shorewall6 to specify $OPTIONS to run at startup, however this
+# this might prevent shorewall6 from starting. use at your own risk
 if [ -f /etc/default/shorewall6 ] ; then
     . /etc/default/shorewall6
 fi
@@ -20,7 +19,7 @@ fi
 
 start() {
 	echo "Starting IPv6 shorewall rules..."
-	exec /sbin/shorewall6 $OPTIONS start $STARTOPTIONS
+	exec /sbin/shorewall6 $OPTIONS start
 }
 
 stop() {
@@ -30,7 +29,7 @@ stop() {
 
 restart() {
 	echo "Restarting IPv6 shorewall rules..."
-	exec /sbin/shorewall6 restart $RESTARTOPTIONS
+	exec /sbin/shorewall6 restart
 }
 
 status() {

Shorewall6/manpages/shorewall6-policy.xml

@@ -242,34 +242,13 @@
 
       <varlistentry>
         <term><emphasis role="bold">BURST:LIMIT</emphasis> (limit) -
-        [-|<replaceable>limit</replaceable>]</term>
+        [{<emphasis>s</emphasis>|<emphasis
+        role="bold">d</emphasis>}:[[<replaceable>name</replaceable>]:]]]<emphasis>rate</emphasis><emphasis
+        role="bold">/</emphasis>{<emphasis
+        role="bold">second</emphasis>|<emphasis
+        role="bold">minute</emphasis>}[:<emphasis>burst</emphasis>]</term>
 
         <listitem>
-          <para>where limit is one of:</para>
-
-          <simplelist>
-            <member>[<emphasis
-            role="bold">-</emphasis>|[{<emphasis>s</emphasis>|<emphasis
-            role="bold">d</emphasis>}:[[<replaceable>name</replaceable>]:]]]<emphasis>rate</emphasis><emphasis
-            role="bold">/</emphasis>{<emphasis
-            role="bold">sec</emphasis>|<emphasis
-            role="bold">min</emphasis>|<emphasis
-            role="bold">hour</emphasis>|<emphasis
-            role="bold">day</emphasis>}[:<emphasis>burst</emphasis>]</member>
-
-            <member>[<replaceable>name</replaceable>1]:<emphasis>rate1</emphasis><emphasis
-            role="bold">/</emphasis>{<emphasis
-            role="bold">sec</emphasis>|<emphasis
-            role="bold">min</emphasis>|<emphasis
-            role="bold">hour</emphasis>|<emphasis
-            role="bold">day</emphasis>}[:<emphasis>burst1</emphasis>],[<replaceable>name</replaceable>2]:<emphasis>rate2</emphasis><emphasis
-            role="bold">/</emphasis>{<emphasis
-            role="bold">sec</emphasis>|<emphasis
-            role="bold">min</emphasis>|<emphasis
-            role="bold">hour</emphasis>|<emphasis
-            role="bold">day</emphasis>}[:<emphasis>burst2</emphasis>]</member>
-          </simplelist>
-
           <para>If passed, specifies the maximum TCP connection
           <emphasis>rate</emphasis> and the size of an acceptable
           <emphasis>burst</emphasis>. If not specified, TCP connections are
@@ -282,19 +261,9 @@
           the user and specifies a hash table to be used to count matching
           connections. If not give, the name <emphasis
           role="bold">shorewall</emphasis> is assumed. Where more than one
-          POLICY or rule specifies the same name, the connections counts for
-          the policies are aggregated and the individual rates apply to the
+          POLICY specifies the same name, the connections counts for the
+          policies are aggregated and the individual rates apply to the
           aggregated count.</para>
-
-          <para>Beginning with Shorewall 4.6.5, two<replaceable>
-          limit</replaceable>s may be specified, separated by a comma. In this
-          case, the first limit (<replaceable>name1</replaceable>,
-          <replaceable>rate1</replaceable>, burst1) specifies the per-source
-          IP limit and the second limit specifies the per-destination IP
-          limit.</para>
-
-          <para>Example: <emphasis
-          role="bold">client:10/sec:20,:60/sec:100</emphasis></para>
         </listitem>
       </varlistentry>
 

Shorewall6/manpages/shorewall6-rules.xml

@@ -943,7 +943,7 @@
           <para>Restriction: MAC addresses are not allowed (this is a
           Netfilter restriction).</para>
 
-          <para>If your kernel and ip6tables have ipset match support then you
+          <para>If you kernel and ip6tables have ipset match support then you
           may give the name of an ipset prefaced by "+". The ipset name may be
           optionally followed by a number from 1 to 6 enclosed in square
           brackets ([]) to indicate the number of levels of destination
@@ -1127,41 +1127,22 @@
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis role="bold">RATE LIMIT</emphasis> (rate) -
-        <replaceable>limit</replaceable></term>
+        <term><emphasis role="bold">RATE LIMIT</emphasis> (rate) - [<emphasis
+        role="bold">-</emphasis>|[{<emphasis>s</emphasis>|<emphasis
+        role="bold">d</emphasis>}:[[<replaceable>name</replaceable>]:]]]<emphasis>rate</emphasis><emphasis
+        role="bold">/</emphasis>{<emphasis
+        role="bold">sec</emphasis>|<emphasis
+        role="bold">min</emphasis>|<emphasis
+        role="bold">hour</emphasis>|<emphasis
+        role="bold">day</emphasis>}[:<emphasis>burst</emphasis>]</term>
 
         <listitem>
-          <para>where <replaceable>limit</replaceable> is one of:</para>
-
-          <simplelist>
-            <member>[<emphasis
-            role="bold">-</emphasis>|[{<emphasis>s</emphasis>|<emphasis
-            role="bold">d</emphasis>}:[[<replaceable>name</replaceable>]:]]]<emphasis>rate</emphasis><emphasis
-            role="bold">/</emphasis>{<emphasis
-            role="bold">sec</emphasis>|<emphasis
-            role="bold">min</emphasis>|<emphasis
-            role="bold">hour</emphasis>|<emphasis
-            role="bold">day</emphasis>}[:<emphasis>burst</emphasis>]</member>
-
-            <member>[<replaceable>name</replaceable>1]:<emphasis>rate1</emphasis><emphasis
-            role="bold">/</emphasis>{<emphasis
-            role="bold">sec</emphasis>|<emphasis
-            role="bold">min</emphasis>|<emphasis
-            role="bold">hour</emphasis>|<emphasis
-            role="bold">day</emphasis>}[:<emphasis>burst1</emphasis>],[<replaceable>name</replaceable>2]:<emphasis>rate2</emphasis><emphasis
-            role="bold">/</emphasis>{<emphasis
-            role="bold">sec</emphasis>|<emphasis
-            role="bold">min</emphasis>|<emphasis
-            role="bold">hour</emphasis>|<emphasis
-            role="bold">day</emphasis>}[:<emphasis>burst2</emphasis>]</member>
-          </simplelist>
-
           <para>You may optionally rate-limit the rule by placing a value in
           this column:</para>
 
-          <para><emphasis>rate*</emphasis> is the number of connections per
+          <para><emphasis>rate</emphasis> is the number of connections per
           interval (<emphasis role="bold">sec</emphasis> or <emphasis
-          role="bold">min</emphasis>) and <emphasis>burst</emphasis>* is the
+          role="bold">min</emphasis>) and <emphasis>burst</emphasis> is the
           largest burst permitted. If no <emphasis>burst</emphasis> is given,
           a value of 5 is assumed. There may be no no white-space embedded in
           the specification.</para>
@@ -1170,28 +1151,13 @@
 
           <para>When <option>s:</option> or <option>d:</option> is specified,
           the rate applies per source IP address or per destination IP address
-          respectively. The <replaceable>name</replaceable>s may be chosen by
-          the user and specifiy a hash table to be used to count matching
+          respectively. The <replaceable>name</replaceable> may be chosen by
+          the user and specifies a hash table to be used to count matching
           connections. If not given, the name <emphasis
           role="bold">shorewallN</emphasis> (where N is a unique integer) is
-          assumed. Where more than one rule or POLICY specifies the same name,
-          the connections counts for the rules are aggregated and the
-          individual rates apply to the aggregated count.</para>
-
-          <para>Beginning with Shorewall 4.6.5, two<replaceable>
-          limit</replaceable>s may be specified, separated by a comma. In this
-          case, the first limit (<replaceable>name1</replaceable>,
-          <replaceable>rate1</replaceable>, burst1) specifies the per-source
-          IP limit and the second limit specifies the per-destination IP
-          limit.</para>
-
-          <para>Example: <emphasis
-          role="bold">client:10/sec:20,:60/sec:100</emphasis></para>
-
-          <para>In this example, the 'client' hash table will be used to
-          enforce the per-source limit and the compiler will pick a unique
-          name for the hash table that tracks the per-destination
-          limit.</para>
+          assumed. Where more than one POLICY specifies the same name, the
+          connections counts for the rules are aggregated and the individual
+          rates apply to the aggregated count.</para>
         </listitem>
       </varlistentry>
 

Shorewall6/manpages/shorewall6.xml

@@ -308,18 +308,6 @@
       expression</replaceable></arg>
     </cmdsynopsis>
 
-    <cmdsynopsis>
-      <command>shorewall6</command>
-
-      <arg
-      choice="opt"><option>trace</option>|<option>debug</option><arg><option>nolock</option></arg></arg>
-
-      <arg>-<replaceable>options</replaceable></arg>
-
-      <arg
-      choice="plain"><option>recover</option><arg><option>-n</option></arg><arg><option>-p</option></arg></arg>
-    </cmdsynopsis>
-
     <cmdsynopsis>
       <command>shorewall6</command>
 
@@ -400,7 +388,7 @@
 
       <arg><option>-T</option></arg>
 
-      <arg><option>-i</option><arg><option>-C</option></arg></arg>
+      <arg><option>-i</option></arg>
 
       <arg><replaceable>directory</replaceable></arg>
     </cmdsynopsis>
@@ -413,8 +401,7 @@
 
       <arg>-<replaceable>options</replaceable></arg>
 
-      <arg
-      choice="plain"><option>restore</option><arg><option>-C</option></arg></arg>
+      <arg choice="plain"><option>restore</option></arg>
 
       <arg><replaceable>filename</replaceable></arg>
     </cmdsynopsis>
@@ -475,8 +462,7 @@
 
       <arg>-<replaceable>options</replaceable></arg>
 
-      <arg
-      choice="plain"><option>save</option><arg><option>-C</option></arg></arg>
+      <arg choice="plain"><option>save</option></arg>
 
       <arg choice="opt"><replaceable>filename</replaceable></arg>
     </cmdsynopsis>
@@ -601,7 +587,7 @@
 
       <arg><option>-T</option></arg>
 
-      <arg><option>-i</option><arg><option>-C</option></arg></arg>
+      <arg><option>-i</option></arg>
 
       <arg><replaceable>directory</replaceable></arg>
     </cmdsynopsis>
@@ -699,7 +685,7 @@
     used for debugging. See <ulink
     url="/starting_and_stopping_shorewall.htm#Trace">http://www.shorewall.net/starting_and_stopping_shorewall.htm#Trace</ulink>.</para>
 
-    <para>The <option>nolock</option> option prevents the command from
+    <para>The nolock <option>option</option> prevents the command from
     attempting to acquire the Shorewall6 lockfile. It is useful if you need to
     include <command>shorewall6</command> commands in
     <filename>/etc/shorewall6/started</filename>.</para>
@@ -779,13 +765,12 @@
           <para>Compiles the configuration in the specified
           <emphasis>directory</emphasis> and discards the compiled output
           script. If no <emphasis>directory</emphasis> is given, then
-          <filename class="directory">/etc/shorewall6</filename> is
-          assumed.</para>
+          /etc/shorewall6 is assumed.</para>
 
-          <para>The <option>-e</option> option causes the
+          <para>The <emphasis role="bold">-e</emphasis> option causes the
           compiler to look for a file named capabilities. This file is
-          produced using the command <command>shorewall6-lite
-          show -f capabilities &gt; capabilities</command> on a system with
+          produced using the command <emphasis role="bold">shorewall6-lite
+          show -f capabilities &gt; capabilities</emphasis> on a system with
           Shorewall6 Lite installed.</para>
 
           <para>The <option>-d</option> option causes the compiler to be run
@@ -803,8 +788,8 @@
           and causes a Perl stack trace to be included with each
           compiler-generated error and warning message.</para>
 
-          <para>The <option>-i</option> option was added in Shorewall 4.6.0
-          and causes a warning message to be issued if the line current line contains
+          <para>The -i option was added in Shorewall 4.6.0 and causes a
+          warning message to be issued if the line current line contains
           alternative input specifications following a semicolon (";"). Such
           lines will be handled incorrectly if INLINE_MATCHES is set to Yes in
           <ulink
@@ -839,17 +824,17 @@
           compile -- -</command>) to suppress the 'Compiling...' message
           normally generated by <filename>/sbin/shorewall6</filename>.</para>
 
-          <para>When <option>-e</option> is specified, the compilation is
-          being performed on a system other than where the compiled script will
-          run. This option disables certain configuration options that require
-          the script to be compiled where it is to be run. The use of
-          <option>-e</option> requires the presence of a configuration file named
-          <filename>capabilities</filename> which may be produced using the
-          command <command>shorewall6-lite show -f capabilities &gt;
-          capabilities</command> on a system with Shorewall6 Lite
+          <para>When -e is specified, the compilation is being performed on a
+          system other than where the compiled script will run. This option
+          disables certain configuration options that require the script to be
+          compiled where it is to be run. The use of -e requires the presence
+          of a configuration file named <filename>capabilities</filename>
+          which may be produced using the command <emphasis
+          role="bold">shorewall6-lite show -f capabilities &gt;
+          capabilities</emphasis> on a system with Shorewall6 Lite
           installed.</para>
 
-          <para>The <option>-c</option> option was added in
+          <para>The <emphasis role="bold">-c</emphasis> option was added in
           Shorewall 4.5.17 and causes conditional compilation of a script. The
           script specified by <replaceable>pathname</replaceable> (or implied
           if <emphasis role="bold">pathname</emphasis> is omitted) is compiled
@@ -870,8 +855,8 @@
           and causes a Perl stack trace to be included with each
           compiler-generated error and warning message.</para>
 
-          <para>The <option>-i</option> option was added in Shorewall 4.6.0
-          and causes a warning message to be issued if the line current line contains
+          <para>The -i option was added in Shorewall 4.6.0 and causes a
+          warning message to be issued if the line current line contains
           alternative input specifications following a semicolon (";"). Such
           lines will be handled incorrectly if INLINE_MATCHES is set to Yes in
           <ulink
@@ -939,14 +924,13 @@
           <para>Produces a verbose report about the firewall configuration for
           the purpose of problem analysis.</para>
 
-          <para>The <option>-x</option> option causes actual
+          <para>The <emphasis role="bold">-x</emphasis> option causes actual
           packet and byte counts to be displayed. Without that option, these
-          counts are abbreviated.</para>
+          counts are abbreviated. The <emphasis role="bold">-m</emphasis>
+          option causes any MAC addresses included in Shorewall6 log messages
+          to be displayed.</para>
 
-          <para>The <option>-m</option> option causes any MAC addresses
-          included in Shorewall6 log messages to be displayed.</para>
-
-          <para>The <option>-l</option> option causes the rule
+          <para>The <emphasis role="bold">-l</emphasis> option causes the rule
           number for each Netfilter rule to be displayed.</para>
         </listitem>
       </varlistentry>
@@ -1000,9 +984,8 @@
         <term><emphasis role="bold">forget</emphasis></term>
 
         <listitem>
-          <para>Deletes <filename>/var/lib/shorewall6/<replaceable>filename
-          </replaceable></filename> and <filename>/var/lib/shorewall6/save
-          </filename>. If no <emphasis>filename</emphasis> is
+          <para>Deletes /var/lib/shorewall6/<emphasis>filename</emphasis> and
+          /var/lib/shorewall6/save. If no <emphasis>filename</emphasis> is
           given then the file specified by RESTOREFILE in <ulink
           url="/manpages6/shorewall6.conf.html">shorewall6.conf</ulink>(5) is
           assumed.</para>
@@ -1062,14 +1045,14 @@
           Shorewall6 Lite on <replaceable>system</replaceable> is started via
           ssh.</para>
 
-          <para>If <option>-s</option> is specified and the
+          <para>If <emphasis role="bold">-s</emphasis> is specified and the
           <emphasis role="bold">start</emphasis> command succeeds, then the
-          remote Shorewall6-lite configuration is saved by executing
-          <command>shorewall6-lite save</command> via ssh.</para>
+          remote Shorewall6-lite configuration is saved by executing <emphasis
+          role="bold">shorewall6-lite save</emphasis> via ssh.</para>
 
-          <para>if <option>-c</option> is included, the
-          command <command>shorewall6-lite show capabilities -f
-          &gt; /var/lib/shorewall6-lite/capabilities</command> is executed
+          <para>if <emphasis role="bold">-c</emphasis> is included, the
+          command <emphasis role="bold">shorewall6-lite show capabilities -f
+          &gt; /var/lib/shorewall6-lite/capabilities</emphasis> is executed
           via ssh then the generated file is copied to
           <replaceable>directory</replaceable> using scp. This step is
           performed before the configuration is compiled.</para>
@@ -1082,8 +1065,8 @@
           and causes a Perl stack trace to be included with each
           compiler-generated error and warning message.</para>
 
-          <para>The <option>-i</option> option was added in Shorewall 4.6.0
-          and causes a warning message to be issued if the line current line contains
+          <para>The -i option was added in Shorewall 4.6.0 and causes a
+          warning message to be issued if the line current line contains
           alternative input specifications following a semicolon (";"). Such
           lines will be handled incorrectly if INLINE_MATCHES is set to Yes in
           <ulink
@@ -1111,7 +1094,7 @@
           <ulink
           url="/manpages6/shorewall6.conf.html">shorewall6.conf</ulink>(5) and
           produces an audible alarm when new Shorewall6 messages are logged.
-          The <option>-m</option> option causes the MAC
+          The <emphasis role="bold">-m</emphasis> option causes the MAC
           address of each packet source to be displayed if that information is
           available. The <replaceable>refresh-interval</replaceable> specifies
           the time in seconds between screen refreshes. You can enter a
@@ -1155,11 +1138,11 @@
           performed by <command>refresh</command> with the exception that
           <command>refresh</command> only recreates the chains specified in
           the command while <command>restart</command> recreates the entire
-          Netfilter ruleset.When no chain name is given to the
-          <command>refresh</command> command, the mangle table is
+          Netfilter ruleset.When no chain name is given to the <emphasis
+          role="bold">refresh</emphasis> command, the mangle table is
           refreshed along with the blacklist chain (if any). This allows you
           to modify <filename>/etc/shorewall6/tcrules</filename>and install
-          the changes using <command>refresh</command>.</para>
+          the changes using <emphasis role="bold">refresh</emphasis>.</para>
 
           <para>The listed chains are assumed to be in the filter table. You
           can refresh chains in other tables by prefixing the chain name with
@@ -1171,15 +1154,15 @@
           <para>The <option>-n</option> option was added in Shorewall 4.5.3
           causes Shorewall to avoid updating the routing table(s).</para>
 
-          <para>The <option>-d</option> option was added in Shorewall 4.5.3
+          <para>The <option>-d </option>option was added in Shorewall 4.5.3
           causes the compiler to run under the Perl debugger.</para>
 
           <para>The <option>-T</option> option was added in Shorewall 4.5.3
           and causes a Perl stack trace to be included with each
           compiler-generated error and warning message.</para>
 
-          <para>The <option>-i</option> option was added in Shorewall 4.6.0
-          and causes a warning message to be issued if the line current line contains
+          <para>The -i option was added in Shorewall 4.6.0 and causes a
+          warning message to be issued if the line current line contains
           alternative input specifications following a semicolon (";"). Such
           lines will be handled incorrectly if INLINE_MATCHES is set to Yes in
           <ulink
@@ -1189,12 +1172,7 @@
           and causes Shorewall to look in the given
           <emphasis>directory</emphasis> first for configuration files.</para>
 
-          <example>
-            <title>Refresh the 'net-fw' chain in the filter table and the
-            'net_dnat' chain in the nat table</title>
-            <programlisting><command>shorewall6 refresh net-fw nat:net_dnat
-            </command></programlisting>
-          </example>
+          <para>Example:<programlisting><command>shorewall6 refresh net2fw nat:net_dnat</command> #Refresh the 'net2loc' chain in the filter table and the 'net_dnat' chain in the nat table</programlisting></para>
         </listitem>
       </varlistentry>
 
@@ -1224,14 +1202,14 @@
           Shorewall6 Lite on <emphasis>system</emphasis> is restarted via
           ssh.</para>
 
-          <para>If <option>-s</option> is specified and the
-          <command>restart</command> command succeeds, then the
-          remote Shorewall6-lite configuration is saved by executing
-          <command>shorewall6-lite save</command> via ssh.</para>
+          <para>If <emphasis role="bold">-s</emphasis> is specified and the
+          <emphasis role="bold">restart</emphasis> command succeeds, then the
+          remote Shorewall6-lite configuration is saved by executing <emphasis
+          role="bold">shorewall6-lite save</emphasis> via ssh.</para>
 
-          <para>if <option>-c</option> is included, the
-          command <command>shorewall6-lite show capabilities -f
-          &gt; /var/lib/shorewall6-lite/capabilities</command> is executed
+          <para>if <emphasis role="bold">-c</emphasis> is included, the
+          command <emphasis role="bold">shorewall6-lite show capabilities -f
+          &gt; /var/lib/shorewall6-lite/capabilities</emphasis> is executed
           via ssh then the generated file is copied to
           <emphasis>directory</emphasis> using scp. This step is performed
           before the configuration is compiled.</para>
@@ -1244,8 +1222,8 @@
           and causes a Perl stack trace to be included with each
           compiler-generated error and warning message.</para>
 
-          <para>The <option>-i</option> option was added in Shorewall 4.6.0
-          and causes a warning message to be issued if the line current line contains
+          <para>The -i option was added in Shorewall 4.6.0 and causes a
+          warning message to be issued if the line current line contains
           alternative input specifications following a semicolon (";"). Such
           lines will be handled incorrectly if INLINE_MATCHES is set to Yes in
           <ulink
@@ -1269,8 +1247,8 @@
         <term><emphasis role="bold">restart</emphasis></term>
 
         <listitem>
-          <para>Restart is similar to <command>shorewall6
-          start</command> except that it assumes that the firewall is already
+          <para>Restart is similar to <emphasis role="bold">shorewall6
+          start</emphasis> except that it assumes that the firewall is already
           started. Existing connections are maintained. If a
           <emphasis>directory</emphasis> is included in the command,
           Shorewall6 will look in that <emphasis>directory</emphasis> first
@@ -1283,40 +1261,31 @@
           table to be flushed; the <command>conntrack</command> utility must
           be installed to use this option.</para>
 
-          <para>The <option>-d</option> option causes the compiler to run
+          <para>The <option>-d </option>option causes the compiler to run
           under the Perl debugger.</para>
 
           <para>The <option>-f</option> option suppresses the compilation step
           and simply reused the compiled script which last started/restarted
-          Shorewall, provided that <filename class="directory">/etc/shorewall6
-          </filename> and its contents have not
+          Shorewall, provided that /etc/shorewall6 and its contents have not
           been modified since the last start/restart.</para>
 
           <para>The <option>-c</option> option was added in Shorewall 4.4.20
           and performs the compilation step unconditionally, overriding the
           AUTOMAKE setting in <ulink
           url="/manpages6/shorewall6.conf.html">shorewall6.conf</ulink>(5).
-          When both <option>-f</option> and <option>-c</option> are present,
+          When both <option>-f</option> and <option>-c </option>are present,
           the result is determined by the option that appears last.</para>
 
           <para>The <option>-T</option> option was added in Shorewall 4.5.3
           and causes a Perl stack trace to be included with each
           compiler-generated error and warning message.</para>
 
-          <para>The <option>-i</option> option was added in Shorewall 4.6.0
-          and causes a warning message to be issued if the line current line contains
+          <para>The -i option was added in Shorewall 4.6.0 and causes a
+          warning message to be issued if the line current line contains
           alternative input specifications following a semicolon (";"). Such
           lines will be handled incorrectly if INLINE_MATCHES is set to Yes in
           <ulink
           url="/manpages6/shorewall6.conf.html">shorewall6.conf</ulink>(5).</para>
-
-          <para>The <option>-C</option> option was added in Shorewall 4.6.5
-          and is only meaningful when AUTOMAKE=Yes in <ulink
-          url="/manpages6/shorewall6.conf.html">shorewall6.conf</ulink>(5). If
-          an existing firewall script is used and if that script was the one
-          that generated the current running configuration, then the running
-          netfilter configuration will be reloaded as is so as to preserve the
-          iptables packet and byte counters.</para>
         </listitem>
       </varlistentry>
 
@@ -1324,27 +1293,14 @@
         <term><emphasis role="bold">restore</emphasis></term>
 
         <listitem>
-          <para>Restore Shorewall6 to a state saved using the
-          <command>shorewall6 save</command> command. Existing connections
+          <para>Restore Shorewall6 to a state saved using the <emphasis
+          role="bold">shorewall6 save</emphasis> command. Existing connections
           are maintained. The <emphasis>filename</emphasis> names a restore
-          file in <filename class="directory">/var/lib/shorewall6</filename>
-          created using <command>shorewall6 save</command>;
-          if no <emphasis>filename</emphasis> is given then Shorewall6 will be
+          file in /var/lib/shorewall6 created using <emphasis
+          role="bold">shorewall6 save</emphasis>; if no
+          <emphasis>filename</emphasis> is given then Shorewall6 will be
           restored from the file specified by the RESTOREFILE option in <ulink
           url="/manpages6/shorewall6.conf.html">shorewall6.conf</ulink>(5).</para>
-
-          <caution>
-            <para>If your ip6tables ruleset depends on variables that are
-            detected at run-time, either in your params file or by
-            Shorewall-generated code, <command>restore</command> will use the
-            values that were current when the ruleset was saved, which may be
-            different from the current values.</para>
-          </caution>
-
-          <para>The <option>-C</option> option was added in Shorewall 4.6.5.
-          If the <option>-C</option> option was specified during
-          <command>shorewall6 save</command>, then the counters saved by
-          that operation will be restored.</para>
         </listitem>
       </varlistentry>
 
@@ -1366,9 +1322,12 @@
           <para>If there are files in the CONFIG_PATH that were modified after
           the current firewall script was generated, the following warning
           message is issued before the script's run command is
-          executed:
-          <screen>WARNING: /var/lib/shorewall6/firewall is not up to
-          date</screen></para>
+          executed:</para>
+
+          <simplelist>
+            <member>WARNING: /var/lib/shorewall6/firewall is not up to
+            date</member>
+          </simplelist>
         </listitem>
       </varlistentry>
 
@@ -1377,10 +1336,9 @@
 
         <listitem>
           <para>Only allowed if Shorewall6 is running. The current
-          configuration is saved in <filename>/var/lib/shorewall6/safe-restart
-          </filename> (see the <emphasis role="bold">save</emphasis>
-          command below) then a <command>shorewall6 restart</command> is
-          done. You will then be prompted asking if you
+          configuration is saved in /var/lib/shorewall6/safe-restart (see the
+          save command below) then a <emphasis role="bold">shorewall6
+          restart</emphasis> is done. You will then be prompted asking if you
           want to accept the new configuration or not. If you answer "n" or if
           you fail to answer within 60 seconds (such as when your new
           configuration has disabled communication with your terminal), the
@@ -1424,19 +1382,14 @@
         <term><emphasis role="bold">save</emphasis></term>
 
         <listitem>
-          <para>The dynamic blacklist is stored in <filename>
-          /var/lib/shorewall6/save</filename>.
-          The state of the firewall is stored in <filename>
-          /var/lib/shorewall6/<replaceable>filename</replaceable></filename>
-          for use by the <command>shorewall6 restore</command> and <command>
-          shorewall6 -f start</command> commands. If <emphasis>filename
-          </emphasis> is not given then the state is saved in the file
-          specified by the RESTOREFILE option in <ulink
+          <para>The dynamic blacklist is stored in /var/lib/shorewall6/save.
+          The state of the firewall is stored in
+          /var/lib/shorewall6/<emphasis>filename</emphasis> for use by the
+          <emphasis role="bold">shorewall6 restore</emphasis> and <emphasis
+          role="bold">shorewall6 -f start</emphasis> commands. If
+          <emphasis>filename</emphasis> is not given then the state is saved
+          in the file specified by the RESTOREFILE option in <ulink
           url="/manpages6/shorewall6.conf.html">shorewall6.conf</ulink>(5).</para>
-
-          <para>The <option>-C</option> option, added in Shorewall 4.6.5,
-          causes the ip6tables packet and byte counters to be saved along with
-          the chains and rules.</para>
         </listitem>
       </varlistentry>
 
@@ -1463,7 +1416,7 @@
               <listitem>
                 <para>Added in Shorewall 4.6.2. Displays the dynamic chain
                 along with any chains produced by entries in
-                shorewall-blrules(5).The <option>-x</option>
+                shorewall-blrules(5).The <emphasis role="bold">-x</emphasis>
                 option is passed directly through to ip6tables and causes
                 actual packet and byte counts to be displayed. Without this
                 option, those counts are abbreviated.</para>
@@ -1475,9 +1428,9 @@
 
               <listitem>
                 <para>Displays your kernel/ip6tables capabilities. The
-                <option>-f</option> option causes the display
-                to be formatted as a capabilities file for use with
-                <command>shorewall6 compile -e</command>.</para>
+                <emphasis role="bold">-f</emphasis> option causes the display
+                to be formatted as a capabilities file for use with <emphasis
+                role="bold">compile -e</emphasis>.</para>
               </listitem>
             </varlistentry>
 
@@ -1487,29 +1440,29 @@
 
               <listitem>
                 <para>The rules in each <emphasis>chain</emphasis> are
-                displayed using the <command>ip6tables
-                -L</command> <emphasis>chain</emphasis> <emphasis
+                displayed using the <emphasis role="bold">ip6tables
+                -L</emphasis> <emphasis>chain</emphasis> <emphasis
                 role="bold">-n -v</emphasis> command. If no
                 <emphasis>chain</emphasis> is given, all of the chains in the
-                filter table are displayed. The <option>-x</option> option is
-                passed directly through to ip6tables and causes actual packet
-                and byte counts to be displayed. Without this option, those
-                counts are abbreviated.
-                The <option>-t</option> option specifies the
+                filter table are displayed. The <emphasis
+                role="bold">-x</emphasis> option is passed directly through to
+                ip6tables and causes actual packet and byte counts to be
+                displayed. Without this option, those counts are abbreviated.
+                The <emphasis role="bold">-t</emphasis> option specifies the
                 Netfilter table to display. The default is <emphasis
                 role="bold">filter</emphasis>.</para>
 
-                <para>The <option>-b</option> ('brief') option
+                <para>The <emphasis role="bold">-b</emphasis> ('brief') option
                 causes rules which have not been used (i.e. which have zero
                 packet and byte counts) to be omitted from the output. Chains
                 with no rules displayed are also omitted from the
                 output.</para>
 
-                <para>The <option>-l</option> option causes
+                <para>The <emphasis role="bold">-l</emphasis> option causes
                 the rule number for each Netfilter rule to be
                 displayed.</para>
 
-                <para>If the <option>-t</option> option and
+                <para>If the <emphasis role="bold">-t</emphasis> option and
                 the <option>chain</option> keyword are both omitted and any of
                 the listed <replaceable>chain</replaceable>s do not exist, a
                 usage message is displayed.</para>
@@ -1577,7 +1530,7 @@
                 <para>Displays the last 20 Shorewall6 messages from the log
                 file specified by the LOGFILE option in <ulink
                 url="/manpages6/shorewall6.conf.html">shorewall6.conf</ulink>(5).
-                The <option>-m</option> option causes the MAC
+                The <emphasis role="bold">-m</emphasis> option causes the MAC
                 address of each packet source to be displayed if that
                 information is available.</para>
               </listitem>
@@ -1597,8 +1550,8 @@
 
               <listitem>
                 <para>Displays the Netfilter mangle table using the command
-                <command>ip6tables -t mangle -L -n
-                -v</command>.The <option>-x</option> option
+                <emphasis role="bold">ip6tables -t mangle -L -n
+                -v</emphasis>.The <emphasis role="bold">-x</emphasis> option
                 is passed directly through to ip6tables and causes actual
                 packet and byte counts to be displayed. Without this option,
                 those counts are abbreviated.</para>
@@ -1665,24 +1618,22 @@
           only if they are allowed by the firewall rules or policies. If a
           <replaceable>directory</replaceable> is included in the command,
           Shorewall6 will look in that <emphasis>directory</emphasis> first
-          for configuration files. If <option>-f</option> is
+          for configuration files. If <emphasis role="bold">-f</emphasis> is
           specified, the saved configuration specified by the RESTOREFILE
           option in <ulink
           url="/manpages6/shorewall6.conf.html">shorewall6.conf</ulink>(5)
           will be restored if that saved configuration exists and has been
-          modified more recently than the files in <filename
-          class="directory">/etc/shorewall6</filename>. When <option>-f
-          </option> is given, a <replaceable>directory</replaceable> may
-          not be specified.</para>
+          modified more recently than the files in /etc/shorewall6. When
+          <emphasis role="bold">-f</emphasis> is given, a
+          <replaceable>directory</replaceable> may not be specified.</para>
 
           <para>Update: In Shorewall6 4.4.20, a new LEGACY_FASTSTART option
           was added to <ulink
           url="/manpages6/shorewall6.conf.html">shorewall6.conf</ulink>(5).
           When LEGACY_FASTSTART=No, the modification times of files in
-          <filename class="directory">/etc/shorewall6</filename> are
-          compared with that of <filename>/var/lib/shorewall6/firewall
-          </filename> (the compiled script that last started/restarted the
-          firewall).</para>
+          /etc/shorewall6 are compared with that of
+          /var/lib/shorewall6/firewall (the compiled script that last
+          started/restarted the firewall).</para>
 
           <para>The <option>-n</option> option causes Shorewall6 to avoid
           updating the routing table(s).</para>
@@ -1691,26 +1642,19 @@
           and performs the compilation step unconditionally, overriding the
           AUTOMAKE setting in <ulink
           url="/manpages6/shorewall6.conf.html">shorewall6.conf</ulink>(5).
-          When both <option>-f</option> and <option>-c</option> are present,
+          When both <option>-f</option> and <option>-c </option>are present,
           the result is determined by the option that appears last.</para>
 
           <para>The <option>-T</option> option was added in Shorewall 4.5.3
           and causes a Perl stack trace to be included with each
           compiler-generated error and warning message.</para>
 
-          <para>The <option>-i</option> option was added in Shorewall 4.6.0
-          and causes a warning message to be issued if the line current line contains
+          <para>The -i option was added in Shorewall 4.6.0 and causes a
+          warning message to be issued if the line current line contains
           alternative input specifications following a semicolon (";"). Such
           lines will be handled incorrectly if INLINE_MATCHES is set to Yes in
           <ulink
           url="/manpages6/shorewall6.conf.html">shorewall6.conf</ulink>(5).</para>
-
-          <para>The <option>-C</option> option was added in Shorewall 4.6.5
-          and is only meaningful when the <option>-f</option> option is also
-          specified. If the previously-saved configuration is restored, and if
-          the <option>-C</option> option was also specified in the
-          <command>save</command> command, then the packet and byte
-          counters will be restored along with the chains and rules.</para>
         </listitem>
       </varlistentry>
 
@@ -1737,7 +1681,7 @@
           <para>Produces a short report about the state of the
           Shorewall6-configured firewall.</para>
 
-          <para>The <option>-i</option> option was added in Shorewall 4.6.2
+          <para>The <option>-i </option>option was added in Shorewall 4.6.2
           and causes the status of each optional or provider interface to be
           displayed.</para>
         </listitem>
@@ -1756,18 +1700,19 @@
           role="bold">start</emphasis> command is performed using the
           specified configuration <replaceable>directory</replaceable>. if an
           error occurs during the compilation phase of the <emphasis
-          role="bold">restart</emphasis> or <emphasis role="bold">start
-          </emphasis>, the command terminates without changing the Shorewall6
-          state. If an error occurs during the <emphasis role="bold">restart
-          </emphasis> phase, then a <command>shorewall6 restore</command> is
-          performed using the saved configuration. If an error occurs during
-          the <emphasis role="bold">start</emphasis> phase, then Shorewall6
-          is cleared. If the <emphasis role="bold">start</emphasis>/
-          <emphasis role="bold">restart</emphasis> succeeds and a
+          role="bold">restart</emphasis> or <emphasis
+          role="bold">start</emphasis>, the command terminates without
+          changing the Shorewall6 state. If an error occurs during the
+          <emphasis role="bold">restart</emphasis> phase, then a <emphasis
+          role="bold">shorewall6 restore</emphasis> is performed using the
+          saved configuration. If an error occurs during the <emphasis
+          role="bold">start</emphasis> phase, then Shorewall6 is cleared. If
+          the <emphasis role="bold">start</emphasis>/<emphasis
+          role="bold">restart</emphasis> succeeds and a
           <replaceable>timeout</replaceable> is specified then a <emphasis
-          role="bold">clear</emphasis> or <emphasis role="bold">restore
-          </emphasis> is performed after <replaceable>timeout</replaceable>
-          seconds.</para>
+          role="bold">clear</emphasis> or <emphasis
+          role="bold">restore</emphasis> is performed after
+          <replaceable>timeout</replaceable> seconds.</para>
 
           <para>Beginning with Shorewall 4.5.0, the numeric
           <replaceable>timeout</replaceable> may optionally be followed by an
@@ -1788,7 +1733,7 @@
           options with non-defaults to a deprecated options section at the
           bottom of the file. Your existing
           <filename>shorewall6.conf</filename> file is renamed
-          <filename>shorewall6.conf.bak</filename>.</para>
+          <filename>shorewall6.conf.bak.</filename></para>
 
           <para>The <option>-a</option> option causes the updated
           <filename>shorewall6.conf</filename> file to be annotated with
@@ -1814,8 +1759,8 @@
           updated, the original is saved in a .bak file in the same
           directory.</para>
 
-          <para>The <option>-i</option> option was added in Shorewall 4.6.0
-          and causes a warning message to be issued if the line current line contains
+          <para>The -i option was added in Shorewall 4.6.0 and causes a
+          warning message to be issued if the line current line contains
           alternative input specifications following a semicolon (";"). Such
           lines will be handled incorrectly if INLINE_MATCHES is set to Yes in
           <ulink

Shorewall6/modules.essential

@@ -24,3 +24,4 @@ loadmodule nf_conntrack_ipv6
 loadmodule xt_state
 loadmodule xt_tcpudp
 loadmodule ip6t_REJECT
+loadmodule ip6t_LOG

Shorewall6/modules.xtables

@@ -30,6 +30,7 @@ loadmodule xt_mac
 loadmodule xt_mark
 loadmodule xt_MARK
 loadmodule xt_multiport
+loadmodule xt_NFLOG
 loadmodule xt_NFQUEUE
 loadmodule xt_owner
 loadmodule xt_physdev

Shorewall6/shorewall6.service

@@ -13,7 +13,7 @@ Type=oneshot
 RemainAfterExit=yes
 EnvironmentFile=-/etc/sysconfig/shorewall6
 StandardOutput=syslog
-ExecStart=/sbin/shorewall6 $OPTIONS start $STARTOPTIONS
+ExecStart=/sbin/shorewall6 $OPTIONS start
 ExecStop=/sbin/shorewall6 $OPTIONS stop
 
 [Install]

Shorewall6/shorewall6.service.214

@@ -1,20 +0,0 @@
-#
-#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall
-#
-#     Copyright 2011 Jonathan Underwood <jonathan.underwood@gmail.com>
-#
-[Unit]
-Description=Shorewall IPv6 firewall
-After=network-online.target
-Conflicts=ip6tables.service firewalld.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=-/etc/sysconfig/shorewall6
-StandardOutput=syslog
-ExecStart=/sbin/shorewall6 $OPTIONS start $STARTOPTIONS
-ExecStop=/sbin/shorewall6 $OPTIONS stop
-
-[Install]
-WantedBy=basic.target

docs/Accounting.xml

@@ -612,102 +612,4 @@ gateway:~#
     <para>The <command>shorewall show nfacct</command> command is a thin
     wrapper around the <command>nfacct list</command> command.</para>
   </section>
-
-  <section>
-    <title>Preserving Counters over Restart and Reboot</title>
-
-    <para>Beginning with Shorewall 4.6.5, it is possible to preserve
-    <emphasis>all</emphasis> ip[6]tables packet and byte counters over
-    restarts and reboots through use of the <option>-C</option> option. This
-    option is available in several commands.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term>save</term>
-
-        <listitem>
-          <para> Causes the packet and byte counters to be saved along with
-          the chains and rules.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>restore</term>
-
-        <listitem>
-          <para>Causes the packet and byte counters (if saved) to be restored
-          along with the chains and rules. </para>
-
-          <caution>
-            <para>If your iptables ruleset depends on variables that are
-            detected at run-time, either in your params file or by
-            Shorewall-generated code, <command>restore</command> will use the
-            values that were detected when the ruleset was saved, which may be
-            different from the current values.</para>
-          </caution>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>start</term>
-
-        <listitem>
-          <para>With Shorewall and Shorewall6, the -C option only has an
-          effect if the <option>-f </option>option is also specified. If a
-          previously-saved configuration is restored, then the packet and byte
-          counters (if saved) will be restored along with the chains and
-          rules. </para>
-
-          <caution>
-            <para>If your iptables ruleset depends on variables that are
-            detected at run-time, either in your params file or by
-            Shorewall-generated code, <option>-C</option> will use the values
-            that were detected when the ruleset was saved, which may be
-            different from the current values.</para>
-          </caution>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>restart</term>
-
-        <listitem>
-          <para>If an existing compiled script is used (no recompilation
-          required) and if that script generated the current running
-          configuration, then the current netfilter configuration is reloaded
-          as is so as to preserve the current packet and byte counters.</para>
-
-          <caution>
-            <para>If your iptables ruleset depends on variables that are
-            detected at run-time, either in your params file or by
-            Shorewall-generated code, <option>-C</option> will use the values
-            that were detected when the ruleset was previously started, which
-            may be different from the current values.</para>
-          </caution>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para> If you wish to (approximately) preserve the counters over a
-    possibly unexpected reboot, then: </para>
-
-    <itemizedlist>
-      <listitem>
-        <para>Create a cron job that periodically executes 'shorewall save
-        <option>-C</option>'.</para>
-      </listitem>
-
-      <listitem>
-        <para>Specify the<option> -C</option> and <option>-f</option> options
-        in the STARTOPTIONS variable in either
-        <filename>/etc/default/shorewall</filename> (
-        <filename>/etc/default/shorewall6</filename>, etc.) or
-        <filename>/etc/sysconfig/shorewall</filename>
-        (<filename>/etc/sysconfig/shorewall</filename>6, etc.), whichever is
-        supported by your distribution. Note that not all distributions
-        include these files so you may have to create the one(s) you
-        need.</para>
-      </listitem>
-    </itemizedlist>
-  </section>
 </article>