From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 851C265F6D for ; Tue, 5 Jan 2021 10:35:52 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 10C9D2582D for ; Tue, 5 Jan 2021 10:35:50 +0100 (CET) Received: from kvmformation1.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id E2F9A254E3 for ; Tue, 5 Jan 2021 10:35:37 +0100 (CET) Received: by kvmformation1.odiso.net (Postfix, from userid 0) id 8F163A0BD5; Tue, 5 Jan 2021 10:35:37 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Tue, 5 Jan 2021 10:35:33 +0100 Message-Id: <20210105093536.1727641-13-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210105093536.1727641-1-aderumier@odiso.com> References: <20210105093536.1727641-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.137 Adjusted score from AWL reputation of From: address HEADER_FROM_DIFFERENT_DOMAINS 0.248 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods KHOP_HELO_FCRDNS 0.287 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [subnets.pm] Subject: [pve-devel] [PATCH pve-network 12/15] subnets: convert dns private function to public sub X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jan 2021 09:35:52 -0000 Signed-off-by: Alexandre Derumier --- PVE/Network/SDN/Subnets.pm | 66 +++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/PVE/Network/SDN/Subnets.pm b/PVE/Network/SDN/Subnets.pm index 25261ac..ec0fb66 100644 --- a/PVE/Network/SDN/Subnets.pm +++ b/PVE/Network/SDN/Subnets.pm @@ -94,7 +94,7 @@ sub find_ip_subnet { return ($subnetid, $subnet); } -my $verify_dns_zone = sub { +sub verify_dns_zone { my ($zone, $dns) = @_; return if !$zone || !$dns; @@ -103,9 +103,9 @@ my $verify_dns_zone = sub { my $plugin_config = $dns_cfg->{ids}->{$dns}; my $plugin = PVE::Network::SDN::Dns::Plugin->lookup($plugin_config->{type}); $plugin->verify_zone($plugin_config, $zone); -}; +} -my $get_reversedns_zone = sub { +sub get_reversedns_zone { my ($subnetid, $subnet, $dns, $ip) = @_; return if !$subnetid || !$dns || !$ip; @@ -114,9 +114,9 @@ my $get_reversedns_zone = sub { my $plugin_config = $dns_cfg->{ids}->{$dns}; my $plugin = PVE::Network::SDN::Dns::Plugin->lookup($plugin_config->{type}); $plugin->get_reversedns_zone($plugin_config, $subnetid, $subnet, $ip); -}; +} -my $add_dns_record = sub { +sub add_dns_record { my ($zone, $dns, $hostname, $ip) = @_; return if !$zone || !$dns || !$hostname || !$ip; @@ -125,9 +125,9 @@ my $add_dns_record = sub { my $plugin = PVE::Network::SDN::Dns::Plugin->lookup($plugin_config->{type}); $plugin->add_a_record($plugin_config, $zone, $hostname, $ip); -}; +} -my $add_dns_ptr_record = sub { +sub add_dns_ptr_record { my ($reversezone, $zone, $dns, $hostname, $ip) = @_; return if !$zone || !$reversezone || !$dns || !$hostname || !$ip; @@ -137,9 +137,9 @@ my $add_dns_ptr_record = sub { my $plugin_config = $dns_cfg->{ids}->{$dns}; my $plugin = PVE::Network::SDN::Dns::Plugin->lookup($plugin_config->{type}); $plugin->add_ptr_record($plugin_config, $reversezone, $hostname, $ip); -}; +} -my $del_dns_record = sub { +sub del_dns_record { my ($zone, $dns, $hostname, $ip) = @_; return if !$zone || !$dns || !$hostname || !$ip; @@ -148,9 +148,9 @@ my $del_dns_record = sub { my $plugin_config = $dns_cfg->{ids}->{$dns}; my $plugin = PVE::Network::SDN::Dns::Plugin->lookup($plugin_config->{type}); $plugin->del_a_record($plugin_config, $zone, $hostname, $ip); -}; +} -my $del_dns_ptr_record = sub { +sub del_dns_ptr_record { my ($reversezone, $dns, $ip) = @_; return if !$reversezone || !$dns || !$ip; @@ -159,7 +159,7 @@ my $del_dns_ptr_record = sub { my $plugin_config = $dns_cfg->{ids}->{$dns}; my $plugin = PVE::Network::SDN::Dns::Plugin->lookup($plugin_config->{type}); $plugin->del_ptr_record($plugin_config, $reversezone, $ip); -}; +} sub next_free_ip { my ($zone, $subnetid, $subnet, $hostname, $mac, $description) = @_; @@ -177,7 +177,7 @@ sub next_free_ip { $hostname .= ".$dnszoneprefix" if $dnszoneprefix; #verify dns zones before ipam - &$verify_dns_zone($dnszone, $dns); + verify_dns_zone($dnszone, $dns); if($ipamid) { my $ipam_cfg = PVE::Network::SDN::Ipams::config(); @@ -191,12 +191,12 @@ sub next_free_ip { } eval { - my $reversednszone = &$get_reversedns_zone($subnetid, $subnet, $reversedns, $ip); + my $reversednszone = get_reversedns_zone($subnetid, $subnet, $reversedns, $ip); #add dns - &$add_dns_record($dnszone, $dns, $hostname, $ip); + add_dns_record($dnszone, $dns, $hostname, $ip); #add reverse dns - &$add_dns_ptr_record($reversednszone, $dnszone, $reversedns, $hostname, $ip); + add_dns_ptr_record($reversednszone, $dnszone, $reversedns, $hostname, $ip); }; if ($@) { #rollback @@ -221,14 +221,14 @@ sub add_ip { my $dns = $zone->{dns}; my $dnszone = $zone->{dnszone}; my $reversedns = $zone->{reversedns}; - my $reversednszone = &$get_reversedns_zone($subnetid, $subnet, $reversedns, $ip); + my $reversednszone = get_reversedns_zone($subnetid, $subnet, $reversedns, $ip); my $dnszoneprefix = $subnet->{dnszoneprefix}; $hostname .= ".$dnszoneprefix" if $dnszoneprefix; #verify dns zones before ipam - &$verify_dns_zone($dnszone, $dns); - &$verify_dns_zone($reversednszone, $reversedns); + verify_dns_zone($dnszone, $dns); + verify_dns_zone($reversednszone, $reversedns); if ($ipamid) { my $ipam_cfg = PVE::Network::SDN::Ipams::config(); @@ -242,9 +242,9 @@ sub add_ip { eval { #add dns - &$add_dns_record($dnszone, $dns, $hostname, $ip); + add_dns_record($dnszone, $dns, $hostname, $ip); #add reverse dns - &$add_dns_ptr_record($reversednszone, $dnszone, $reversedns, $hostname, $ip); + add_dns_ptr_record($reversednszone, $dnszone, $reversedns, $hostname, $ip); }; if ($@) { #rollback @@ -268,14 +268,14 @@ sub update_ip { my $dns = $zone->{dns}; my $dnszone = $zone->{dnszone}; my $reversedns = $zone->{reversedns}; - my $reversednszone = &$get_reversedns_zone($subnetid, $subnet, $reversedns, $ip); + my $reversednszone = get_reversedns_zone($subnetid, $subnet, $reversedns, $ip); my $dnszoneprefix = $subnet->{dnszoneprefix}; $hostname .= ".$dnszoneprefix" if $dnszoneprefix; #verify dns zones before ipam - &$verify_dns_zone($dnszone, $dns); - &$verify_dns_zone($reversednszone, $reversedns); + verify_dns_zone($dnszone, $dns); + verify_dns_zone($reversednszone, $reversedns); if ($ipamid) { my $ipam_cfg = PVE::Network::SDN::Ipams::config(); @@ -292,11 +292,11 @@ sub update_ip { eval { #add dns - &$del_dns_record($dnszone, $dns, $oldhostname, $ip); - &$add_dns_record($dnszone, $dns, $hostname, $ip); + del_dns_record($dnszone, $dns, $oldhostname, $ip); + add_dns_record($dnszone, $dns, $hostname, $ip); #add reverse dns - &$del_dns_ptr_record($reversednszone, $reversedns, $ip); - &$add_dns_ptr_record($reversednszone, $dnszone, $reversedns, $hostname, $ip); + del_dns_ptr_record($reversednszone, $reversedns, $ip); + add_dns_ptr_record($reversednszone, $dnszone, $reversedns, $hostname, $ip); }; } @@ -312,13 +312,13 @@ sub del_ip { my $dns = $zone->{dns}; my $dnszone = $zone->{dnszone}; my $reversedns = $zone->{reversedns}; - my $reversednszone = &$get_reversedns_zone($subnetid, $subnet, $reversedns, $ip); + my $reversednszone = get_reversedns_zone($subnetid, $subnet, $reversedns, $ip); my $dnszoneprefix = $subnet->{dnszoneprefix}; $hostname .= ".$dnszoneprefix" if $dnszoneprefix; - &$verify_dns_zone($dnszone, $dns); - &$verify_dns_zone($reversednszone, $reversedns); + verify_dns_zone($dnszone, $dns); + verify_dns_zone($reversednszone, $reversedns); if ($ipamid) { my $ipam_cfg = PVE::Network::SDN::Ipams::config(); @@ -328,8 +328,8 @@ sub del_ip { } eval { - &$del_dns_record($dnszone, $dns, $hostname, $ip); - &$del_dns_ptr_record($reversednszone, $reversedns, $ip); + del_dns_record($dnszone, $dns, $hostname, $ip); + del_dns_ptr_record($reversednszone, $reversedns, $ip); }; if ($@) { warn $@; -- 2.20.1