lix-project/lix
20
58
Fork 31
Code Issues 364 Code Review (Gerrit) Projects 3 Releases Wiki Activity

SSH.pm: Print a friendlier message if connecting fails

Browse source 
"got EOF while expecting 8 bytes from remote side" is not very
helpful.
This commit is contained in:
Eelco Dolstra 2014-11-10 16:03:51 +01:00
parent 087581a642
commit d436e44ae3
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
perl/lib/Nix/CopyClosure.pm
View file

@ -57,6 +57,7 @@ sub copyTo {
if ($@) { if ($@) {
chomp $@; chomp $@;
warn "$@; falling back to old closure copying method\n"; warn "$@; falling back to old closure copying method\n";
$@ = "";
return oldCopyTo(@_); return oldCopyTo(@_);
} }

9
perl/lib/Nix/SSH.pm
View file

@ -1,5 +1,6 @@
package Nix::SSH; package Nix::SSH;
use utf8;
use strict; use strict;
use File::Temp qw(tempdir); use File::Temp qw(tempdir);
use IPC::Open2; use IPC::Open2;
@ -89,10 +90,16 @@ sub connectToRemoteNix {
my $pid = open2($from, $to, "exec ssh -x -a $sshHost @globalSshOpts @{$sshOpts} nix-store --serve --write $extraFlags"); my $pid = open2($from, $to, "exec ssh -x -a $sshHost @globalSshOpts @{$sshOpts} nix-store --serve --write $extraFlags");
# Do the handshake. # Do the handshake.
my $magic;
eval {
my $SERVE_MAGIC_1 = 0x390c9deb; # FIXME my $SERVE_MAGIC_1 = 0x390c9deb; # FIXME
my $clientVersion = 0x200; my $clientVersion = 0x200;
syswrite($to, pack("L<x4L<x4", $SERVE_MAGIC_1, $clientVersion)) or die; syswrite($to, pack("L<x4L<x4", $SERVE_MAGIC_1, $clientVersion)) or die;
die "did not get valid handshake from remote host\n" if readInt($from) != 0x5452eecb; $magic = readInt($from);
};
die "unable to connect to ‘$sshHost’\n" if $@;
die "did not get valid handshake from remote host\n" if $magic != 0x5452eecb;
my $serverVersion = readInt($from); my $serverVersion = readInt($from);
die "unsupported server version\n" if $serverVersion < 0x200 || $serverVersion >= 0x300; die "unsupported server version\n" if $serverVersion < 0x200 || $serverVersion >= 0x300;