Revert "Network: tap_create|plug : sdn : use bridge_vlan"

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

diff --git a/src/PVE/Network.pm b/src/PVE/Network.pm
index 8dfc9c2fd063de88defd70b05c85635c6ed02333..98a58fa98ee683ff2148a50cd24f0e9be44cbd25 100644 (file)
--- a/src/PVE/Network.pm
+++ b/src/PVE/Network.pm
@@ -2,15 +2,16 @@ package PVE::Network;
 
 use strict;
 use warnings;
-use PVE::Tools qw(run_command lock_file);
-use PVE::ProcFSTools;
+
 use PVE::INotify;
+use PVE::ProcFSTools;
+use PVE::Tools qw(run_command lock_file);
+
 use File::Basename;
 use IO::Socket::IP;
-use Socket qw(NI_NUMERICHOST NI_NUMERICSERV);
-use POSIX qw(ECONNREFUSED);
-
 use Net::IP;
+use POSIX qw(ECONNREFUSED);
+use Socket qw(NI_NUMERICHOST NI_NUMERICSERV);
 
 # host network related utility functions
 
@@ -233,11 +234,11 @@ my $bridge_add_interface = sub {
        } else {
            system("/sbin/bridge vlan add dev $iface vid 2-4094") == 0 ||
            die "unable to add default vlan tags to interface $iface\n" if !$trunks;
-       } 
+       }
 
        if ($trunks) {
            my @trunks_array = split /;/, $trunks;
-           foreach my $trunk (@trunks_array) { 
+           foreach my $trunk (@trunks_array) {
                system("/sbin/bridge vlan add dev $iface vid $trunk") == 0 ||
                die "unable to add vlan $trunk to interface $iface\n";
            }
@@ -275,7 +276,7 @@ sub tap_create {
 
     my $bridgemtu = &$read_bridge_mtu($bridge);
 
-    eval { 
+    eval {
        disable_ipv6($iface);
        PVE::Tools::run_command(['/sbin/ip', 'link', 'set', $iface, 'up', 'promisc', 'on', 'mtu', $bridgemtu]);
     };
@@ -348,7 +349,7 @@ my $create_firewall_bridge_ovs = sub {
 
     # set the same mtu for ovs int port
     PVE::Tools::run_command(['/sbin/ip', 'link', 'set', $ovsintport, 'mtu', $bridgemtu]);
-    
+
     &$bridge_add_interface($fwbr, $ovsintport);
 };
 
@@ -356,7 +357,7 @@ my $cleanup_firewall_bridge = sub {
     my ($iface) = @_;
 
     my ($vmid, $devid) = &$parse_tap_device_name($iface, 1);
-    return if !defined($vmid);  
+    return if !defined($vmid);
     my ($fwbr, $vethfw, $vethfwpeer, $ovsintport) = &$compute_fwbr_names($vmid, $devid);
 
     # cleanup old port config from any openvswitch bridge
@@ -422,7 +423,7 @@ sub tap_unplug {
 
        iface_set_master($iface, undef);
     }
-    
+
     &$cleanup_firewall_bridge($iface);
     #cleanup old port config from any openvswitch bridge
     eval {run_command("/usr/bin/ovs-vsctl del-port $iface", outfunc => sub {}, errfunc => sub {}) };
@@ -433,7 +434,7 @@ sub copy_bridge_config {
 
     return if $br0 eq $br1;
 
-    my $br_configs = [ 'ageing_time', 'stp_state', 'priority', 'forward_delay', 
+    my $br_configs = [ 'ageing_time', 'stp_state', 'priority', 'forward_delay',
                       'hello_time', 'max_age', 'multicast_snooping', 'multicast_querier'];
 
     foreach my $sysname (@$br_configs) {
@@ -451,7 +452,7 @@ sub copy_bridge_config {
 sub activate_bridge_vlan_slave {
     my ($bridgevlan, $iface, $tag) = @_;
     my $ifacevlan = "${iface}.$tag";
-       
+
     # create vlan on $iface is not already exist
     if (! -d "/sys/class/net/$ifacevlan") {
        system("/sbin/ip link add link $iface name $ifacevlan type vlan id $tag") == 0 ||
@@ -585,19 +586,12 @@ sub is_ip_in_cidr {
 sub get_local_ip_from_cidr {
     my ($cidr) = @_;
 
-    my $cmd = ['/sbin/ip', 'address', 'show', 'to', $cidr, 'up'];
-
     my $IPs = [];
-
-    my $code = sub {
-       my $line = shift;
-
-       if ($line =~ m!^\s*inet(?:6)?\s+($PVE::Tools::IPRE)/\d+!) {
+    run_command(['/sbin/ip', 'address', 'show', 'to', $cidr, 'up'], outfunc => sub {
+       if ($_[0] =~ m!^\s*inet(?:6)?\s+($PVE::Tools::IPRE)(?:/\d+|\s+peer\s+)!) {
            push @$IPs, $1;
        }
-    };
-
-    PVE::Tools::run_command($cmd, outfunc => $code);
+    });
 
     return $IPs;
 }
@@ -613,19 +607,22 @@ sub addr_to_ip {
 sub get_ip_from_hostname {
     my ($hostname, $noerr) = @_;
 
-    my ($family, $ip);
-
-    eval {
-       my @res = PVE::Tools::getaddrinfo_all($hostname);
-       $family = $res[0]->{family};
-       $ip = addr_to_ip($res[0]->{addr})
-    };
+    my @res = eval { PVE::Tools::getaddrinfo_all($hostname) };
     if ($@) {
        die "hostname lookup '$hostname' failed - $@" if !$noerr;
        return undef;
     }
 
-    if ($ip =~ m/^127\.|^::1$/) {
+    my ($ip, $family);
+    for my $ai (@res) {
+       $family = $ai->{family};
+       my $tmpip = addr_to_ip($ai->{addr});
+       if ($tmpip !~ m/^127\.|^::1$/) {
+           $ip = $tmpip;
+           last;
+       }
+    }
+    if (!defined($ip) ) {
        die "hostname lookup '$hostname' failed - got local IP address '$ip'\n" if !$noerr;
        return undef;
     }