decode comments in /etc/network/interfaces as utf8

[pve-common.git] / src / PVE / INotify.pm

diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm
index f0f3144355c7d35319b9e4e2cc39f82bbbc7b29b..dee9a3e9b2b6a48b0780b5a76feda425b269e5c1 100644 (file)
--- a/src/PVE/INotify.pm
+++ b/src/PVE/INotify.pm
@@ -753,6 +753,24 @@ my $extract_ovs_option = sub {
     return $v;
 };
 
+my $check_mtu = sub {
+    my ($ifaces, $parent, $child) = @_;
+
+    die "check mtu - missing parent interface\n" if !$parent;
+    die "check mtu - missing child interface\n" if !$child;
+
+    my $cmtu = $ifaces->{$child}->{mtu};
+    return if !$cmtu;
+
+    my $parentdata = $ifaces->{$parent};
+    my $pmtu = $parentdata->{mtu};
+    $pmtu = $cmtu if $parentdata->{type} eq 'bond' && !$pmtu;
+    $pmtu = 1500 if !$pmtu;
+
+    die "interface '$parent' - mtu $pmtu is lower than '$child' - mtu $cmtu\n"
+       if $pmtu < $cmtu;
+};
+
 # config => {
 #   ifaces => {
 #     $ifname => {
@@ -855,10 +873,9 @@ sub __read_etc_network_interfaces {
            while (defined ($line = <$fh>)) {
                chomp $line;
                if ($line =~ m/^\s*#(.*?)\s*$/) {
-                   # NOTE: we use 'comments' instead of 'comment' to 
-                   # avoid automatic utf8 conversion
                    $f->{comments} = '' if !$f->{comments};
-                   $f->{comments} .= "$1\n";
+                   my $comment = decode('UTF-8', $1);
+                   $f->{comments} .= "$comment\n";
                } elsif ($line =~ m/^\s*(?:iface\s
                                           |mapping\s
                                           |auto\s
@@ -874,6 +891,7 @@ sub __read_etc_network_interfaces {
                    $id = $options_alternatives->{$id} if $options_alternatives->{$id};
 
                    my $simple_options = {
+                       'mtu' => 1,
                        'ovs_type' => 1,
                        'ovs_options' => 1,
                        'ovs_bridge' => 1,
@@ -1137,10 +1155,10 @@ sub __interface_to_string {
        $done->{'bond_xmit_hash_policy'} = 1;
     } elsif ($d->{type} eq 'vxlan') {
 
-        foreach my $k (qw(vxlan-id vxlan-svcnodeip vxlan-physdev vxlan-local-tunnelip)) {
-            $raw .= "\t$k $d->{$k}\n" if $d->{$k};
+       foreach my $k (qw(vxlan-id vxlan-svcnodeip vxlan-physdev vxlan-local-tunnelip)) {
+           $raw .= "\t$k $d->{$k}\n" if defined $d->{$k};
            $done->{$k} = 1;
-        }
+       }
 
        if ($d->{'vxlan-remoteip'}) {
            foreach my $remoteip (@{$d->{'vxlan-remoteip'}}) {
@@ -1233,7 +1251,7 @@ sub write_etc_network_interfaces {
     my ($filename, $fh, $config) = @_;
     my $ifupdown2 = -e '/usr/share/ifupdown2';
     my $raw = __write_etc_network_interfaces($config, $ifupdown2);
-    PVE::Tools::safe_print($filename, $fh, $raw);
+    PVE::Tools::safe_print($filename, $fh, encode('UTF-8', $raw));
 }
 sub __write_etc_network_interfaces {
     my ($config, $ifupdown2) = @_;
@@ -1261,10 +1279,10 @@ sub __write_etc_network_interfaces {
     # delete unused OVS ports
     foreach my $iface (keys %$ifaces) {
        my $d = $ifaces->{$iface};
-       if ($d->{type} eq 'OVSPort' || $d->{type} eq 'OVSIntPort' || 
+       if ($d->{type} eq 'OVSPort' || $d->{type} eq 'OVSIntPort' ||
            $d->{type} eq 'OVSBond') {
            my $brname = $used_ports->{$iface};
-           if (!$brname || !$ifaces->{$brname}) { 
+           if (!$brname || !$ifaces->{$brname}) {
                if ($iface =~ /^$PVE::Network::PHYSICAL_NIC_RE/) {
                    $ifaces->{$iface} = { type => 'eth',
                                          exists => 1,
@@ -1294,13 +1312,15 @@ sub __write_etc_network_interfaces {
                $n->{autostart} = 0;
                if ($n->{type} eq 'eth') {
                    $n->{type} = 'OVSPort';
-                   $n->{ovs_bridge} = $iface;              
+                   $n->{ovs_bridge} = $iface;
                } elsif ($n->{type} eq 'OVSBond' || $n->{type} eq 'OVSPort' ||
                    $n->{type} eq 'OVSIntPort') {
                    $n->{ovs_bridge} = $iface;
                } else {
                    die "interface '$p' is not defined as OVS port/bond\n";
                }
+
+               &$check_mtu($ifaces, $iface, $p);
            }
        }
     }
@@ -1315,6 +1335,7 @@ sub __write_etc_network_interfaces {
                    if !$n;
                die "OVS bond '$iface' - wrong interface type on slave '$p' " .
                    "('$n->{type}' != 'eth')\n" if $n->{type} ne 'eth';
+               &$check_mtu($ifaces, $iface, $p);
            }
        }
     }
@@ -1330,6 +1351,7 @@ sub __write_etc_network_interfaces {
                    if !$n;
                die "bond '$iface' - wrong interface type on slave '$p' " .
                    "('$n->{type}' != 'eth')\n" if $n->{type} ne 'eth';
+               &$check_mtu($ifaces, $iface, $p);
            }
        }
     }
@@ -1341,7 +1363,7 @@ sub __write_etc_network_interfaces {
 
        if ($d->{type} eq 'vxlan' && $d->{'vxlan-id'}) {
            my $vxlanid = $d->{'vxlan-id'};
-           die "iface $iface : duplicate vxlan-id $vxlanid already used in $vxlans->{$vxlanid}\n" if $vxlans->{$vxlanid};
+           die "iface $iface - duplicate vxlan-id $vxlanid already used in $vxlans->{$vxlanid}\n" if $vxlans->{$vxlanid};
            $vxlans->{$vxlanid} = $iface;
        }
 
@@ -1350,12 +1372,13 @@ sub __write_etc_network_interfaces {
        ++$ips if defined $d->{'vxlan-remoteip'};
        ++$ips if defined $d->{'vxlan-local-tunnelip'};
        if ($ips > 1) {
-            die "ifac $iface : vxlan-svcnodeip, vxlan-remoteip and vxlan-localtunnelip are mutually exclusive\n";
+           die "iface $iface - vxlan-svcnodeip, vxlan-remoteip and vxlan-localtunnelip are mutually exclusive\n";
        }
 
        if (defined($d->{'vxlan-svcnodeip'}) != defined($d->{'vxlan-physdev'})) {
-           die "iface $iface : vxlan-svcnodeip and vxlan-physdev must be define together\n";
+           die "iface $iface - vxlan-svcnodeip and vxlan-physdev must be define together\n";
        }
+       #fixme : check if vxlan mtu is lower than 50bytes than physical interface where tunnel is going out
     }
 
     # check vlan
@@ -1366,7 +1389,7 @@ sub __write_etc_network_interfaces {
            my $n = $ifaces->{$p};
 
            die "vlan '$iface' - unable to find parent '$p'\n"
-               if $n->{exists} eq 0;
+               if !$n;
 
            if ($n->{type} eq 'bridge' && !$n->{bridge_vlan_aware}) {
                die "vlan '$iface' - bridge vlan aware is not enabled on parent '$p'\n";
@@ -1374,6 +1397,7 @@ sub __write_etc_network_interfaces {
                die "vlan '$iface' - wrong interface type on parent '$p' " .
                    "('$n->{type}' != 'eth|bond|bridge' )\n";
            }
+           &$check_mtu($ifaces, $p, $iface);
        }
     }
 
@@ -1384,9 +1408,11 @@ sub __write_etc_network_interfaces {
        my $d = $ifaces->{$iface};
        if ($d->{type} eq 'bridge') {
            foreach my $p (split (/\s+/, $d->{bridge_ports})) {
+               $p =~ s/\.\d+$//;
                my $n = $ifaces->{$p};
                die "bridge '$iface' - unable to find bridge port '$p'\n"
                    if !$n;
+               &$check_mtu($ifaces, $iface, $p);
                $bridgeports->{$p} = $iface;
            }
            $bridges->{$iface} = $d;
@@ -1397,12 +1423,12 @@ sub __write_etc_network_interfaces {
        my $d = $ifaces->{$iface};
 
         foreach my $k (qw(bridge-learning bridge-arp-nd-suppress bridge-unicast-flood bridge-multicast-flood bridge-access)) {
-           die "iface $iface : bridgeports options can be used only if interface is in a bridge\n" 
+           die "iface $iface - $k: bridge port specific options can be used only on interfaces attached to a bridge\n"
                if $d->{$k} && !$bridgeports->{$iface};
         }
 
        if ($d->{'bridge-access'} && !$bridges->{$bridgeports->{$iface}}->{bridge_vlan_aware}) {
-           die "iface $iface : bridge-access option can be only used if interface is in a vlan aware bridge\n";
+           die "iface $iface - bridge-access option can be only used if interface is in a vlan aware bridge\n";
        }
     }