Update version to 3.2.0 Beta 4

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

Shorewall/compiler

@@ -1106,7 +1106,7 @@ verify_mark() # $1 = value to test
     verify_mark1()
     {
 	[ $1 -lt 256 ] && return 0
-	[ -n "$XCONNMARK" ] || return 1
+	[ -n "$HIGH_ROUTE_MARKS" ] || return 1
 	[ $1 -gt 65535 ] && return 1
 	return $(($1 & 0XFF))
     }
@@ -3370,6 +3370,8 @@ process_tc_rule()
 			    fatal_error "Invalid mark value ($mark) in rule \"$rule\""
 			    ;;
 		    esac
+		elif [ -n "$HIGH_ROUTE_MARKS" -a $chain = tcpre ]; then
+		    fatal_error "Marks < 256 may not be set in the PREROUTING chain when HIGH_ROUTE_MARKS=Yes"
 		fi
 	    fi
 	    ;;
@@ -3488,10 +3490,9 @@ setup_tc1() {
 
     #
     # Route marks are restored in PREROUTING/OUTPUT prior to these rules. We only send
-    # packets that are not part of a marked connection to the 'tcpre/tcout' chains unless
-    # HIGH_
+    # packets that are not part of a marked connection to the 'tcpre/tcout' chains.
     #
-    if [ -z "$HIGH_ROUTE_MARKS" -a -n "$ROUTEMARK_INTERFACES" ]; then
+    if [ -n "$ROUTEMARK_INTERFACES" ]; then
 	mark_part="-m mark --mark 0"
     fi
 

Shorewall/fallback.sh

@@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of
 #       Shoreline Firewall.
 
-VERSION=3.2.0-Beta3
+VERSION=3.2.0-Beta4
 
 usage() # $1 = exit status
 {

Shorewall/install.sh

@@ -22,7 +22,7 @@
 #       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 #
 
-VERSION=3.2.0-Beta3
+VERSION=3.2.0-Beta4
 
 usage() # $1 = exit status
 {

Shorewall/releasenotes.txt

@@ -113,9 +113,7 @@ Other changes in 3.2.0 Beta 4
 	b) You may only set those mark values in the FORWARD chain.
 
 	c) Marks used for traffic shaping must still be in the range of 1-255
-	   but these may now be set in any chain. If they are set in the
-	   FORWARD chain, they must be set before any routing marks (those
-	   with values greater than 255).
+	   and may still not be set in the forward chain.
 
 	d) When you SAVE or RESTORE in tcrules, only the TC mark value is
 	   saved or restored. Shorewall handles saving and restoring the

Shorewall/shorecap

@@ -44,7 +44,7 @@
 #    used during firewall compilation, then the generated firewall program will likewise not
 #    require Shorewall to be installed.
 
-VERSION=3.2.0-Beta3
+VERSION=3.2.0-Beta4
 
 #
 # Suppress all output for a command

Shorewall/uninstall.sh

@@ -26,7 +26,7 @@
 #       You may only use this script to uninstall the version
 #       shown below. Simply run this script to remove Shorewall Firewall
 
-VERSION=3.2.0-Beta3
+VERSION=3.2.0-Beta4
 
 usage() # $1 = exit status
 {