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 B448960802 for ; Thu, 3 Dec 2020 10:20:23 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9D6BC2545B for ; Thu, 3 Dec 2020 10:19:53 +0100 (CET) Received: from kvmformation1.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id 81D5B25421 for ; Thu, 3 Dec 2020 10:19:52 +0100 (CET) Received: by kvmformation1.odiso.net (Postfix, from userid 0) id 3961013024D; Thu, 3 Dec 2020 10:19:45 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Thu, 3 Dec 2020 10:19:38 +0100 Message-Id: <20201203091942.2401958-4-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201203091942.2401958-1-aderumier@odiso.com> References: <20201203091942.2401958-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.214 Adjusted score from AWL reputation of From: address HEADER_FROM_DIFFERENT_DOMAINS 0.25 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.399 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. [powerdnsplugin.pm, subnets.pm, pveplugin.pm] Subject: [pve-devel] [PATCH V2 pve-network 3/7] use canonical ipv6 address (RFC 5952) everywhere 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: Thu, 03 Dec 2020 09:20:23 -0000 we want only 1 format for ipam database Signed-off-by: Alexandre Derumier --- PVE/Network/SDN/Dns/PowerdnsPlugin.pm | 3 +-- PVE/Network/SDN/Ipams/PVEPlugin.pm | 5 +++-- PVE/Network/SDN/Subnets.pm | 9 ++++++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/PVE/Network/SDN/Dns/PowerdnsPlugin.pm b/PVE/Network/SDN/Dns/PowerdnsPlugin.pm index b00432e..3fbd595 100644 --- a/PVE/Network/SDN/Dns/PowerdnsPlugin.pm +++ b/PVE/Network/SDN/Dns/PowerdnsPlugin.pm @@ -7,8 +7,7 @@ use PVE::Cluster; use PVE::Tools; use JSON; use Net::IP; -use NetAddr::IP; - +use NetAddr::IP qw(:lower); use base('PVE::Network::SDN::Dns::Plugin'); sub type { diff --git a/PVE/Network/SDN/Ipams/PVEPlugin.pm b/PVE/Network/SDN/Ipams/PVEPlugin.pm index e4c9ef7..a2e7d86 100644 --- a/PVE/Network/SDN/Ipams/PVEPlugin.pm +++ b/PVE/Network/SDN/Ipams/PVEPlugin.pm @@ -6,7 +6,8 @@ use PVE::INotify; use PVE::Cluster qw(cfs_read_file cfs_write_file cfs_register_file cfs_lock_file); use PVE::Tools; use JSON; -use NetAddr::IP; +use NetAddr::IP qw(:lower); + use Net::IP; use Digest::SHA; @@ -134,7 +135,7 @@ sub add_next_freeip { while(1) { $iplist++; last if $iplist eq $broadcast; - my $ip = $iplist->addr(); + my $ip = $iplist->canon(); next if defined($dbsubnet->{ips}->{$ip}); $freeip = $ip; last; diff --git a/PVE/Network/SDN/Subnets.pm b/PVE/Network/SDN/Subnets.pm index 74a538c..81970a1 100644 --- a/PVE/Network/SDN/Subnets.pm +++ b/PVE/Network/SDN/Subnets.pm @@ -5,6 +5,7 @@ use warnings; use Net::Subnet qw(subnet_matcher); use Net::IP; +use NetAddr::IP qw(:lower); use PVE::Cluster qw(cfs_read_file cfs_write_file cfs_lock_file); use PVE::Network::SDN::Dns; @@ -213,6 +214,9 @@ sub add_ip { return if !$subnet || !$ip; + my $ipaddr = new NetAddr::IP($ip); + $ip = $ipaddr->canon(); + my $ipamid = $zone->{ipam}; my $dns = $zone->{dns}; my $dnszone = $zone->{dnszone}; @@ -255,7 +259,10 @@ sub add_ip { sub del_ip { my ($zone, $subnetid, $subnet, $ip, $hostname) = @_; - return if !$subnet; + return if !$subnet || !$ip; + + my $ipaddr = new NetAddr::IP($ip); + $ip = $ipaddr->canon(); my $ipamid = $zone->{ipam}; my $dns = $zone->{dns}; -- 2.20.1