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 8E3396218E for ; Fri, 18 Dec 2020 18:02:17 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 868C2C0A9 for ; Fri, 18 Dec 2020 18:02:17 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id F30DBC09B for ; Fri, 18 Dec 2020 18:02:16 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id C17A145366; Fri, 18 Dec 2020 18:02:16 +0100 (CET) To: Proxmox VE development discussion , Alexandre Derumier References: <20201203091942.2401958-1-aderumier@odiso.com> <20201203091942.2401958-4-aderumier@odiso.com> From: Thomas Lamprecht Message-ID: Date: Fri, 18 Dec 2020 18:02:14 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:84.0) Gecko/20100101 Thunderbird/84.0 MIME-Version: 1.0 In-Reply-To: <20201203091942.2401958-4-aderumier@odiso.com> Content-Type: text/plain; charset=UTF-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.064 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches 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, powerdnsplugin.pm, pveplugin.pm] Subject: Re: [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: Fri, 18 Dec 2020 17:02:17 -0000 On 03/12/2020 10:19, Alexandre Derumier wrote: > 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); nit, please do not use old style new, do: my $ipaddr = NetAddr::IP->new($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); same as above, prefer my $ipaddr = NetAddr::IP->new($ip); > + $ip = $ipaddr->canon(); > > my $ipamid = $zone->{ipam}; > my $dns = $zone->{dns}; >