TCP flags are valid on any type of rule, don't skip them on block or …

…reject rules
pfsense · Jun 15, 2013 · e8ddd3a · e8ddd3a
1 parent df78d8c
commit e8ddd3a
Showing 1 changed file with 29 additions and 29 deletions.
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
@@ -2257,37 +2257,37 @@ function filter_generate_user_rule($rule) {
 	if ($type == "pass") {
 		if (isset($rule['allowopts']))
 			$aline['allowopts'] = " allow-opts ";
-
+	}
-		$aline['flags'] = "";
+	$aline['flags'] = "";
-		if ($rule['protocol'] == "tcp") {
+	if ($rule['protocol'] == "tcp") {
-			if (isset($rule['tcpflags_any']))
+		if (isset($rule['tcpflags_any']))
-				$aline['flags'] = "flags any ";
+			$aline['flags'] = "flags any ";
-			else if (!empty($rule['tcpflags2'])) {
+		else if (!empty($rule['tcpflags2'])) {
-				$aline['flags'] = "flags ";
+			$aline['flags'] = "flags ";
-				if (!empty($rule['tcpflags1'])) {
+			if (!empty($rule['tcpflags1'])) {
-					$flags1 = explode(",", $rule['tcpflags1']);
+				$flags1 = explode(",", $rule['tcpflags1']);
-					foreach ($flags1 as $flag1) {
+				foreach ($flags1 as $flag1) {
-						// CWR flag needs special treatment
+					// CWR flag needs special treatment
-						if($flag1[0] == "c")
+					if($flag1[0] == "c")
-							$aline['flags'] .= "W";
+						$aline['flags'] .= "W";
-						else
+					else
-							$aline['flags'] .= strtoupper($flag1[0]);
+						$aline['flags'] .= strtoupper($flag1[0]);
-					}
 				}
-				$aline['flags'] .= "/";
+			}
-				if (!empty($rule['tcpflags2'])) {
+			$aline['flags'] .= "/";
-					$flags2 = explode(",", $rule['tcpflags2']);
+			if (!empty($rule['tcpflags2'])) {
-					foreach ($flags2 as $flag2) {
+				$flags2 = explode(",", $rule['tcpflags2']);
-						// CWR flag needs special treatment
+				foreach ($flags2 as $flag2) {
-						if($flag2[0] == "c")
+					// CWR flag needs special treatment
-							$aline['flags'] .= "W";
+					if($flag2[0] == "c")
-						else
+						$aline['flags'] .= "W";
-							$aline['flags'] .= strtoupper($flag2[0]);
+					else
-					}
+						$aline['flags'] .= strtoupper($flag2[0]);
 				}
-				$aline['flags'] .= " ";
+			}
-			} else
+			$aline['flags'] .= " ";
-				$aline['flags'] = "flags S/SA ";
+		} else {
+			$aline['flags'] = "flags S/SA ";
 		}
 
 		/*