iSCSI ipv6 support

[pve-storage.git] / PVE / Storage.pm

diff --git a/PVE/Storage.pm b/PVE/Storage.pm
index 9a313b083f29b1d84929df5e2266f1efe11491a4..927219ab878fd99287973c5cccece722eb80eb40 100755 (executable)
--- a/PVE/Storage.pm
+++ b/PVE/Storage.pm
@@ -12,7 +12,7 @@ use File::Path;
 use Cwd 'abs_path';
 use Socket;
 
-use PVE::Tools qw(run_command file_read_firstline);
+use PVE::Tools qw(run_command file_read_firstline $IPV6RE);
 use PVE::Cluster qw(cfs_read_file cfs_lock_file);
 use PVE::Exception qw(raise_param_exc);
 use PVE::JSONSchema;
@@ -996,6 +996,8 @@ sub scan_zfs {
            my ($pool, $size_str, $used_str) = ($1, $2, $3);
            my $size = PVE::Storage::ZFSPoolPlugin::zfs_parse_size($size_str);
            my $used = PVE::Storage::ZFSPoolPlugin::zfs_parse_size($used_str);
+           # ignore subvolumes generated by our ZFSPoolPlugin
+           return if $pool =~ m!/subvol-\d+-[^/]+$!; 
            push @$res, { pool => $pool, size => $size, free => $size-$used };
        }
     });
@@ -1006,12 +1008,11 @@ sub scan_zfs {
 sub resolv_portal {
     my ($portal, $noerr) = @_;
 
-    if ($portal =~ m/^([^:]+)(:(\d+))?$/) {
-       my $server = $1;
-       my $port = $3;
-
+    my ($server, $port) = PVE::Tools::parse_host_and_port($portal);
+    if ($server) {
        if (my $ip = resolv_server($server)) {
            $server = $ip;
+           $server = "[$server]" if $server =~ /^$IPV6RE$/;
            return $port ? "$server:$port" : $server;
        }
     }