From 48732a2daed4e1b39a87b184286d42f0276714d9 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Mon, 18 Oct 2004 21:01:28 +0000
Subject: [PATCH] Fix enhancement to packet marking capability

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1702 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall2/firewall | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/Shorewall2/firewall b/Shorewall2/firewall
index 1518a00ce..ec4f8d278 100755
--- a/Shorewall2/firewall
+++ b/Shorewall2/firewall
@@ -2342,27 +2342,6 @@ process_tc_rule()
 	    esac
 	fi
 
-	case $testval in
-	    -)
-		;;
-	    !*:C)
-		marktest="connmark ! "
-		testval=${testval%:*}
-		testval=${testval#!}
-		;;
-	    *:C)
-		marktest="connmark "
-		testval=${testval%:*}
-		;;
-	    !*)
-		marktest="mark ! "
-		testval=${testval#!}
-		;;
-	    *)
-		[ -n "$testval" ] && marktest="mark "
-		;;
-	esac
-
 	[ -n "$marktest" ] && r="${r}-m ${marktest}--mark $testval "
 
 	[ "x$dest"   = "x-"  ] || r="${r}$(dest_ip_range $dest) "
@@ -2439,6 +2418,27 @@ process_tc_rule()
 	    ;;
     esac
 
+    case $testval in
+	-)
+	    ;;
+	!*:C)
+	    marktest="connmark ! "
+	    testval=${testval%:*}
+	    testval=${testval#!}
+	    ;;
+	*:C)
+	    marktest="connmark "
+	    testval=${testval%:*}
+	    ;;
+	!*)
+	    marktest="mark ! "
+	    testval=${testval#!}
+	    ;;
+	*)
+	    [ -n "$testval" ] && marktest="mark "
+	    ;;
+    esac
+
     for source in $(separate_list ${sources:=-}); do
 	for dest in $(separate_list ${dests:=-}); do
 	    for port in $(separate_list ${ports:=-}); do