From 58cbe639010fad9bd9df1a2e2ddac7fd76b19e5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Fri, 4 Aug 2017 14:54:01 +0200 Subject: [PATCH] migrate: read mtunnel version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler --- PVE/QemuMigrate.pm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index beaa1e34..a0380509 100644 --- a/PVE/QemuMigrate.pm +++ b/PVE/QemuMigrate.pm @@ -143,6 +143,16 @@ sub fork_tunnel { }; my $err = $@; + eval { + my $ver = $self->read_tunnel($tunnel, 10); + if ($ver =~ /^ver (\d+)$/) { + $tunnel->{version} = $1; + $self->log('info', "ssh tunnel $ver\n"); + } else { + $err = "received invalid tunnel version string '$ver'\n" if !$err; + } + }; + if ($err) { $self->finish_command_pipe($tunnel); die "can't open migration tunnel - $err";