X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=blobdiff_plain;f=src%2Fpvefw;h=754a4eafd791a669df60859ce4e983e2a9160a87;hp=a87bafb8cee4e233ebfebec9586bec594bc58e48;hb=680d56eeb067910b25282765782278ced2bc6beb;hpb=c4a2e5aeb5f0e6eab8e02796d3e703a5481d8618 diff --git a/src/pvefw b/src/pvefw index a87bafb..754a4ea 100755 --- a/src/pvefw +++ b/src/pvefw @@ -60,11 +60,11 @@ __PACKAGE__->register_method ({ if !defined($param->{verbose}) && ($rpcenv->{type} eq 'cli'); my $code = sub { - my ($ruleset, $hostfw_conf, $ipset_ruleset) = PVE::Firewall::compile(); + my ($ruleset, $ipset_ruleset) = PVE::Firewall::compile(); if ($param->{verbose}) { - my (undef, $ipset_changes) = PVE::Firewall::get_ipset_cmdlist($ipset_ruleset, 1); - my (undef, $ruleset_changes) = PVE::Firewall::get_rulset_cmdlist($ruleset, 1); + my (undef, undef, $ipset_changes) = PVE::Firewall::get_ipset_cmdlist($ipset_ruleset, 1); + my (undef, $ruleset_changes) = PVE::Firewall::get_ruleset_cmdlist($ruleset, 1); if ($ipset_changes || $ruleset_changes) { print "detected changes\n"; } else { @@ -115,10 +115,10 @@ __PACKAGE__->register_method ({ my $res = { status => $status }; if ($status eq 'active') { - my ($ruleset, $hostfw_conf, $ipset_ruleset) = PVE::Firewall::compile(); + my ($ruleset, $ipset_ruleset) = PVE::Firewall::compile(); - my (undef, $ipset_changes) = PVE::Firewall::get_ipset_cmdlist($ipset_ruleset); - my (undef, $ruleset_changes) = PVE::Firewall::get_rulset_cmdlist($ruleset); + my (undef, undef, $ipset_changes) = PVE::Firewall::get_ipset_cmdlist($ipset_ruleset); + my (undef, $ruleset_changes) = PVE::Firewall::get_ruleset_cmdlist($ruleset); # fixme: ipset changes $res->{changes} = ($ipset_changes || $ruleset_changes) ? 1 : 0; }