From 807b9ca627a7eab6b54796145efc15a1683975ae Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Mon, 15 Dec 2014 09:39:24 -0800
Subject: [PATCH] Revert "Improve handling of mark ranges"

This reverts commit 62f480897e2476c3125c1c839a3e42a14f8d2596.
---
 Shorewall/Perl/Shorewall/Tc.pm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/Tc.pm b/Shorewall/Perl/Shorewall/Tc.pm
index 666e3b62f..0cbde42fb 100644
--- a/Shorewall/Perl/Shorewall/Tc.pm
+++ b/Shorewall/Perl/Shorewall/Tc.pm
@@ -231,12 +231,6 @@ sub process_mangle_rule1( $$$$$$$$$$$$$$$$$$ ) {
 	my ( $option, $marktype ) = @_;
 	my $and_or = $params =~ s/^([|&])// ? $1 : '';
 
-	if ( $option ) {
-	    $target = join( ' ', $target, $option );
-	} else {
-	    $target = join( ' ', $target, $and_or eq '|' ? '--or-mark' : $and_or ? '--and-mark' : '--set-mark' );
-	}
-
 	if ( $params =~ /-/ ) {
 	    #
 	    # A Mark Range
@@ -266,6 +260,8 @@ sub process_mangle_rule1( $$$$$$$$$$$$$$$$$$ ) {
 	    $chain ||= $designator;
 	    $chain ||= $default_chain;
 
+	    $option = '--set-mark';
+
 	    my $chainref = ensure_chain( 'mangle', $chain = $chainnames{$chain} );
 
 	    for ( my $packet = 0; $packet < $marks; $packet++, $markval += $increment ) {
@@ -290,7 +286,7 @@ sub process_mangle_rule1( $$$$$$$$$$$$$$$$$$ ) {
 			     $source ,
 			     $dest ,
 			     '' ,
-			     join( ' ', $target,  $option , join( '/', in_hex( $markval ) , $mask ) ) ,
+			     "$target $option " . join( '/', in_hex( $markval ) , $mask ) ,
 			     '',
 			     $target ,
 			     $exceptionrule );
@@ -321,6 +317,12 @@ sub process_mangle_rule1( $$$$$$$$$$$$$$$$$$ ) {
 		}
 	    }
 
+	    if ( $option ) {
+		$target = join( ' ', $target, $option );
+	    } else {
+		$target = join( ' ', $target, $and_or eq '|' ? '--or-mark' : $and_or ? '--and-mark' : '--set-mark' );
+	    }
+
 	    ( $mark, my $mask ) = split '/', $mark;
 
 	    if ( supplied $mask ) {