From 7b351da680cad41623c3f9853ff2eea3cb8e3545 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Jul 2014 16:19:17 +0200 Subject: [PATCH] Remove obsolete SSH master connection code --- perl/lib/Nix/SSH.pm | 55 +------------------------------------- scripts/build-remote.pl.in | 2 +- 2 files changed, 2 insertions(+), 55 deletions(-) diff --git a/perl/lib/Nix/SSH.pm b/perl/lib/Nix/SSH.pm index dd3e5cefd..76a209975 100644 --- a/perl/lib/Nix/SSH.pm +++ b/perl/lib/Nix/SSH.pm @@ -6,63 +6,12 @@ use IPC::Open2; our @ISA = qw(Exporter); our @EXPORT = qw( - sshOpts openSSHConnection closeSSHConnection readN readInt readString readStrings writeInt writeString writeStrings connectToRemoteNix ); -our @sshOpts = split ' ', ($ENV{"NIX_SSHOPTS"} or ""); - -push @sshOpts, "-x"; - -my $sshStarted = 0; -my $sshHost; - - -# Open a master SSH connection to `host', unless there already is a -# running master connection (as determined by `-O check'). -sub openSSHConnection { - my ($host) = @_; - die if $sshStarted; - $sshHost = $host; - return 1 if system("ssh $sshHost @sshOpts -O check 2> /dev/null") == 0; - - my $tmpDir = tempdir("nix-ssh.XXXXXX", CLEANUP => 1, TMPDIR => 1) - or die "cannot create a temporary directory"; - - push @sshOpts, "-S", "$tmpDir/control"; - - # Start the master. We can't use the `-f' flag (fork into - # background after establishing the connection) because then the - # child continues to run if we are killed. So instead make SSH - # print "started" when it has established the connection, and wait - # until we see that. - open SSHPIPE, "ssh $sshHost @sshOpts -M -N -o LocalCommand='echo started' -o PermitLocalCommand=yes |" or die; - - while () { - chomp; - if ($_ eq "started") { - $sshStarted = 1; - return 1; - } - } - - return 0; -} - - -# Tell the master SSH client to exit. -sub closeSSHConnection { - if ($sshStarted) { - system("ssh $sshHost @sshOpts -O exit 2> /dev/null") == 0 - or warn "unable to stop SSH master: $?"; - $sshStarted = 0; - } -} - - sub readN { my ($bytes, $from) = @_; my $res = ""; @@ -133,7 +82,7 @@ sub connectToRemoteNix { # Start ‘nix-store --serve’ on the remote host. my ($from, $to); # FIXME: don't start a shell, start ssh directly. - my $pid = open2($from, $to, "exec ssh $sshHost @{$sshOpts} nix-store --serve --write $extraFlags"); + my $pid = open2($from, $to, "exec ssh -x -a $sshHost @{$sshOpts} nix-store --serve --write $extraFlags"); # Do the handshake. my $SERVE_MAGIC_1 = 0x390c9deb; # FIXME @@ -147,6 +96,4 @@ sub connectToRemoteNix { } -END { my $saved = $?; closeSSHConnection; $? = $saved; } - 1; diff --git a/scripts/build-remote.pl.in b/scripts/build-remote.pl.in index a55d75825..73d7abe37 100755 --- a/scripts/build-remote.pl.in +++ b/scripts/build-remote.pl.in @@ -194,7 +194,7 @@ REQ: while (1) { # Connect to the selected machine. - @sshOpts = ("-i", $machine->{sshKeys}, "-x"); + my @sshOpts = ("-i", $machine->{sshKeys}); $hostName = $machine->{hostName}; eval { ($from, $to) = connectToRemoteNix($hostName, \@sshOpts, "2>&4");