X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=blobdiff_plain;f=src%2FPVE%2FFirewall.pm;h=c7ddd10e29313f80980fa16f044116e008ee028a;hp=634ff90c8ab7f216af72a3e4b0f9590cf4c220ce;hb=cfd7cd9caa8d26130d8eee9007b56aff805463e4;hpb=044409e5b479a4bbff6147dab3d8350fab156e58 diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm index 634ff90..c7ddd10 100644 --- a/src/PVE/Firewall.pm +++ b/src/PVE/Firewall.pm @@ -20,6 +20,7 @@ use IO::File; use Net::IP; use PVE::Tools qw(run_command lock_file dir_glob_foreach); use Encode; +use Storable qw(dclone); my $hostfw_conf_filename = "/etc/pve/local/host.fw"; my $pvefw_conf_dir = "/etc/pve/firewall"; @@ -548,7 +549,8 @@ my $FWACCEPTMARK_ON = "0x80000000/0x80000000"; my $FWACCEPTMARK_OFF = "0x00000000/0x80000000"; my $pve_std_chains = {}; -$pve_std_chains->{4} = { +my $pve_std_chains_conf = {}; +$pve_std_chains_conf->{4} = { 'PVEFW-SET-ACCEPT-MARK' => [ { target => "-j MARK --set-mark $FWACCEPTMARK_ON" }, ], @@ -641,7 +643,7 @@ $pve_std_chains->{4} = { ], }; -$pve_std_chains->{6} = { +$pve_std_chains_conf->{6} = { 'PVEFW-SET-ACCEPT-MARK' => [ { target => "-j MARK --set-mark $FWACCEPTMARK_ON" }, ], @@ -3354,6 +3356,9 @@ sub compile { my $vmfw_configs; + # fixme: once we read standard chains from config this needs to be put in test/standard cases below + $pve_std_chains = dclone($pve_std_chains_conf); + if ($vmdata) { # test mode my $testdir = $vmdata->{testdir} || die "no test directory specified"; my $filename = "$testdir/cluster.fw";