From ce36326d1fc77f0dbd141b9bf0771a1ac21b221a Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Tue, 25 Mar 2014 09:20:52 +0100 Subject: [PATCH] cleanup_fw_rule: only copy defined rule properties --- src/PVE/Firewall.pm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm index c4b319f..d7788f0 100644 --- a/src/PVE/Firewall.pm +++ b/src/PVE/Firewall.pm @@ -636,23 +636,6 @@ sub parse_port_name_number_or_range { } # helper function for API -sub cleanup_fw_rule { - my ($rule, $digest, $pos) = @_; - - my $r = {}; - - foreach my $k (keys %$rule) { - next if $k eq 'nbdport'; - next if $k eq 'nbsport'; - my $v = $rule->{$k}; - next if !defined($v); - $r->{$k} = $v; - $r->{digest} = $digest; - $r->{pos} = $pos; - } - - return $r; -} my $rule_properties = { pos => { @@ -708,6 +691,23 @@ my $rule_properties = { }, }; +sub cleanup_fw_rule { + my ($rule, $digest, $pos) = @_; + + my $r = {}; + + foreach my $k (keys %$rule) { + next if !$rule_properties->{$k}; + my $v = $rule->{$k}; + next if !defined($v); + $r->{$k} = $v; + $r->{digest} = $digest; + $r->{pos} = $pos; + } + + return $r; +} + sub add_rule_properties { my ($properties) = @_; -- 2.39.2