From: Dietmar Maurer <dietmar@proxmox.com>
Date: Wed, 26 Feb 2014 06:22:02 +0000 (+0100)
Subject: always use PVEFW-SET-ACCEPT-MARK for OUT chain
X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=commitdiff_plain;h=fdb0bf200c4d48f0826c365ace8f126c535a4600

always use PVEFW-SET-ACCEPT-MARK for OUT chain

That way we can re-use chains for the host firewall.
---

diff --git a/PVE/Firewall.pm b/PVE/Firewall.pm
index 343f60c..75a5737 100644
--- a/PVE/Firewall.pm
+++ b/PVE/Firewall.pm
@@ -653,7 +653,7 @@ sub generate_bridge_chains {
     if (!ruleset_chain_exist($ruleset, "$bridge-IN")) {
 	ruleset_create_chain($ruleset, "$bridge-IN");
 	ruleset_addrule($ruleset, "$bridge-FW", "-m physdev --physdev-is-bridged --physdev-is-out -j $bridge-IN");
-	ruleset_addrule($ruleset, "$bridge-FW", "-j ACCEPT");
+	ruleset_addrule($ruleset, "$bridge-FW", "-m mark --mark 1 -j ACCEPT");
     }
 }
 
@@ -688,7 +688,7 @@ sub generate_tap_rules_direction {
 		ruleset_addrule($ruleset, $tapchain, "-m mark --mark 1 -j RETURN")
 		    if $direction eq 'OUT';
 	    } else {
-		$rule->{action} = "RETURN" if $rule->{action} eq 'ACCEPT' && $direction eq 'OUT';
+		$rule->{action} = "PVEFW-SET-ACCEPT-MARK" if $rule->{action} eq 'ACCEPT' && $direction eq 'OUT';
 		ruleset_generate_rule($ruleset, $tapchain, $rule);
 	    }
 	}
@@ -705,7 +705,7 @@ sub generate_tap_rules_direction {
 
     if ($policy eq 'ACCEPT') {
 	if ($direction eq 'OUT') {
-	    ruleset_addrule($ruleset, $tapchain, "-j RETURN");
+	    ruleset_addrule($ruleset, $tapchain, "-g PVEFW-SET-ACCEPT-MARK");
 	} else {
 	    ruleset_addrule($ruleset, $tapchain, "-j ACCEPT");
 	}