remove dead code

add a few extra options to the ssh invocation

svn path=/branches/new-fu/; revision=298

1 files changed, 3 insertions, 7 deletions

diff --git a/client/scireclient.pl b/client/scireclient.pl
index bfab4a5..bab1ced 100755
--- a/client/scireclient.pl
+++ b/client/scireclient.pl
@@ -9,7 +9,6 @@ use IPC::Open2;
 use Getopt::Long;
 use Data::Dumper;
 use File::Path;
-#use Net::SSH::Perl::Key;
 
 my $SCIRE_CONFIG_FILE = '../etc/scire.conf'; #will be /etc/scire.conf when released.
 my %conf;
@@ -97,12 +96,6 @@ sub send_command {
 	return $response;
 }
 
-#sub get_response {
-#	my $response = <SERVER_STDOUT>;
-#	print "Got: ${response}" if($conf{debug});
-#	return $response;
-#}
-
 sub parse_response {
 	my $response = shift;
 	$response =~ /^(OK|ERROR)(?: (.+))?$/;
@@ -124,6 +117,9 @@ sub create_connection {
 sub build_connection_command {
 	# This will eventually be something like "ssh scire@${scireserver} /usr/bin/scireserver.pl"
 	my $connection_command = "ssh ";
+	$connection_command .= "-o BatchMode yes ";
+	$connection_command .= "-o SendEnv 'SCIRE_*' ";
+	$connection_command .= "-o ServerAliveInterval 15 -o ServerAliveCountMax 4 ";
 	if(defined($conf{port})) {
 		$connection_command .= "-o Port=$conf{port} ";
 	}