[pve-devel] [PATCH common v2] inotify/interfaces: ensure cidr, address and netmask are set correctly

[Thomas Lamprecht]

This should bring back compatibillity in the read site and one for
all clears that cidr is cidr, netmask is mask and address is address
(outgoing).

We're still very flexible on what can be written out.

Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
---

changes v1 -> v2:
* add test changes to commit

 src/PVE/INotify.pm                            | 62 +++++++++++++++----
 .../t.list-interfaces.pl                      | 14 +++--
 2 files changed, 59 insertions(+), 17 deletions(-)

diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm
index 8654356..ae9e5e2 100644
--- a/src/PVE/INotify.pm
+++ b/src/PVE/INotify.pm
@@ -1109,23 +1109,34 @@ sub __read_etc_network_interfaces {
 	}
 
 	# map address and netmask to cidr
-	if ($d->{address}) {
-	    if ($d->{netmask}) {
-		if ($d->{netmask} =~ m/^\d+$/) { # e.g. netmask 20
-		    $d->{address} = $d->{address} . "/" . $d->{netmask};
-		} elsif (my $mask = PVE::JSONSchema::get_netmask_bits($d->{netmask})) {
-		    $d->{address} = $d->{address} . "/" . $mask;
-		}
+	if (my $addr = $d->{address}) {
+	    if (_address_is_cidr($addr)) {
+		$d->{cidr} = $addr;
+		my ($baseaddr, $mask) = _cidr_split($addr);
+		$d->{address} = $baseaddr;
+		$d->{netmask} = $mask;
+	    } elsif (my $cidr = _get_cidr($d->{address}, $d->{netmask})) {
+		$d->{cidr} = $cidr;
+		(undef, $d->{netmask}) = _cidr_split($cidr);
+	    } else {
+		# no mask, else we'd got a cidr above
+		$d->{cidr} = $addr ."/32";
 	    }
-	   # for api compatibility
-	   $d->{cidr} = $d->{address};
 	}
 
 	# map address6 and netmask6 to cidr6
-	if ($d->{address6}) {
-	    $d->{address6} .= "/" . $d->{netmask6} if $d->{address6} !~ m!^(.*)/(\d+)$! && $d->{netmask6};
-	    # for api compatibility
-	    $d->{cidr6} = $d->{address6};
+	if (my $addr6 = $d->{address6}) {
+	    if (_address_is_cidr($addr6)) {
+		$d->{cidr6} = $addr6;
+		my ($baseaddr, $mask) = _cidr_split($addr6);
+		$d->{address6} = $baseaddr;
+		$d->{netmask6} = $mask;
+	    } elsif (my $cidr6 = _get_cidr($d->{address6}, $d->{netmask6})) {
+		$d->{cidr6} = $cidr6;
+	    } else {
+		# no mask, else we'd got a cidr above
+		$d->{cidr6} = $addr6 ."/128";
+	    }
 	}
 
 	$d->{method} = 'manual' if !$d->{method};
@@ -1163,6 +1174,31 @@ sub __read_etc_network_interfaces {
     return $config;
 }
 
+sub _address_is_cidr {
+    my ($addr) = @_;
+    return $addr =~ /\/\d+$/ ? 1 : 0;
+}
+
+sub _cidr_split {
+    my ($cidr) = @_;
+    $cidr =~ /^(.+)\/(\d+)$/;
+    return ($1, $2); # (address, mask)
+}
+
+sub _get_cidr {
+    my ($addr, $mask) = @_;
+
+    return $addr if _address_is_cidr($addr);
+    return undef if !$mask;
+
+    if ($mask =~ m/^\d+$/) { # cidr notation
+	return $addr . "/" . $mask;
+    } elsif (my $cidrmask = PVE::JSONSchema::get_netmask_bits($mask)) {
+	return $addr . "/" . $cidrmask;
+    }
+    return undef;
+}
+
 sub __interface_to_string {
     my ($iface, $d, $family, $first_block, $ifupdown2) = @_;
 
diff --git a/test/etc_network_interfaces/t.list-interfaces.pl b/test/etc_network_interfaces/t.list-interfaces.pl
index ff44fd1..9466752 100644
--- a/test/etc_network_interfaces/t.list-interfaces.pl
+++ b/test/etc_network_interfaces/t.list-interfaces.pl
@@ -17,13 +17,19 @@ eth100:
 
 my %wanted = (
     vmbr0 => {
-	address => '192.168.1.2/24',
+	address => '192.168.1.2',
+	netmask => '24',
+	cidr => '192.168.1.2/24',
 	gateway => '192.168.1.1',
-	address6 => 'fc05::1:1/112',
+	address6 => 'fc05::1:1',
+	netmask6 => '112',
+	cidr6 => 'fc05::1:1/112',
     },
     vmbr1 => {
-	address => '10.0.0.5/24',
-    },
+	address => '10.0.0.5',
+	netmask => '24',
+	cidr => '10.0.0.5/24',
+    }
 );
 
 save('interfaces', <<"/etc/network/interfaces");
-- 
2.20.1