From a9c463ce6917bcccd012bcfc37b1c756a16958cc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fabian=20Gr=C3=BCnbichler?= Date: Tue, 2 Jul 2019 10:27:49 +0200 Subject: [PATCH] corosync: refactor if conditions MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit to remove one level of indentation Signed-off-by: Fabian Grünbichler --- src/PVE/Firewall.pm | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm index ef724a7..16d7301 100644 --- a/src/PVE/Firewall.pm +++ b/src/PVE/Firewall.pm @@ -2473,14 +2473,11 @@ sub enable_host_firewall { PVE::Corosync::for_all_corosync_addresses($corosync_conf, $ipversion, sub { my ($node_name, $node_ip, $node_ipversion, $key) = @_; + my $destination = $corosync_local_addresses->{$key}; - if ($node_name ne $local_hostname) { - my $destination = $corosync_local_addresses->{$key}; - + if ($node_name ne $local_hostname && defined($destination)) { # accept only traffic on same ring - if (defined($destination)) { - ruleset_addrule($ruleset, $chain, "-d $destination -s $node_ip $corosync_rule", "-j $accept_action"); - } + ruleset_addrule($ruleset, $chain, "-d $destination -s $node_ip $corosync_rule", "-j $accept_action"); } }); } @@ -2542,14 +2539,11 @@ sub enable_host_firewall { PVE::Corosync::for_all_corosync_addresses($corosync_conf, $ipversion, sub { my ($node_name, $node_ip, $node_ipversion, $key) = @_; + my $source = $corosync_local_addresses->{$key}; - if ($node_name ne $local_hostname) { - my $source = $corosync_local_addresses->{$key}; - + if ($node_name ne $local_hostname && defined($source)) { # accept only traffic on same ring - if (defined($source)) { - ruleset_addrule($ruleset, $chain, "-s $source -d $node_ip $corosync_rule", "-j $accept_action"); - } + ruleset_addrule($ruleset, $chain, "-s $source -d $node_ip $corosync_rule", "-j $accept_action"); } }); } -- 2.39.2