--- loncom/LondConnection.pm	2007/04/10 23:15:20	1.46
+++ loncom/LondConnection.pm	2010/12/21 11:17:33	1.50
@@ -1,7 +1,7 @@
 #   This module defines and implements a class that represents
 #   a connection to a lond daemon.
 #
-# $Id: LondConnection.pm,v 1.46 2007/04/10 23:15:20 albertel Exp $
+# $Id: LondConnection.pm,v 1.50 2010/12/21 11:17:33 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -241,11 +241,11 @@ sub new {
 	if((defined $ca)  && (defined $cert) && (defined $sslkeyfile)) {
 
 	    $self->{AuthenticationMode} = "ssl";
-	    $self->{TransactionRequest} = "init:ssl\n";
+	    $self->{TransactionRequest} = "init:ssl:$perlvar{'lonVersion'}\n";
 	} else {
 	    if($InsecureOk) {		# Allowed to do insecure:
 		$self->{AuthenticationMode} = "insecure";
-		$self->{TransactionRequest} = "init\n";
+		$self->{TransactionRequest} = "init::$perlvar{'lonVersion'}\n";
 	    }
 	    else {		# Not allowed to do insecure...
 		$socket->close;
@@ -342,6 +342,8 @@ sub Readable {
     }
     #  Append the data to the buffer.  And figure out if the read is done:
 
+    $self->{TimeoutRemaining}   = $self->{TimeoutValue}; # getting data resets the timeout period.
+
     &Debug(9,"Received from host: ".$data);
     $self->{TransactionReply} .= $data;
     if($self->{TransactionReply} =~ m/\n$/) {
@@ -501,7 +503,6 @@ sub Readable {
 		$self->{InformWritable}     = 1;
 		$self->{InformReadable}     = 0;
 		$self->{Timeoutable}        = 1;
-		$self->{TimeoutRemaining}   = $self->{TimeoutValue};
 		$self->Transition("SendingRequest");
 		return 0;
 	    } else {
@@ -563,41 +564,42 @@ sub Writable {
 	($errno == POSIX::EAGAIN)         ||
 	($errno == POSIX::EINTR)          ||
 	($errno ==  0)) {
+	$self->{TimeoutRemaining} = $self->{TimeoutValue};
 	substr($self->{TransactionRequest}, 0, $nwritten) = ""; # rmv written part
-      if(length $self->{TransactionRequest} == 0) {
-         $self->{InformWritable} = 0;
-         $self->{InformReadable} = 1;
-         $self->{TransactionReply} = '';
-         #
-         # Figure out the next state:
-         #
-         if($self->{State} eq "Connected") {
-            $self->Transition("Initialized");
-         } elsif($self->{State} eq "ChallengeReceived") {
-            $self->Transition("ChallengeReplied");
-         } elsif($self->{State} eq "RequestingVersion") {
-            $self->Transition("ReadingVersionString");
-         } elsif ($self->{State} eq "SetHost") {
-            $self->Transition("HostSet");
-         } elsif($self->{State} eq "RequestingKey") {
-            $self->Transition("ReceivingKey");
+	if(length $self->{TransactionRequest} == 0) {
+	    $self->{InformWritable} = 0;
+	    $self->{InformReadable} = 1;
+	    $self->{TransactionReply} = '';
+	    #
+	    # Figure out the next state:
+	    #
+	    if($self->{State} eq "Connected") {
+		$self->Transition("Initialized");
+	    } elsif($self->{State} eq "ChallengeReceived") {
+		$self->Transition("ChallengeReplied");
+	    } elsif($self->{State} eq "RequestingVersion") {
+		$self->Transition("ReadingVersionString");
+	    } elsif ($self->{State} eq "SetHost") {
+		$self->Transition("HostSet");
+	    } elsif($self->{State} eq "RequestingKey") {
+		$self->Transition("ReceivingKey");
 #            $self->{InformWritable} = 0;
 #            $self->{InformReadable} = 1;
 #            $self->{TransactionReply} = '';
-         } elsif ($self->{State} eq "SendingRequest") {
-            $self->Transition("ReceivingReply");
-            $self->{TimeoutRemaining} = $self->{TimeoutValue};
-         } elsif ($self->{State} eq "Disconnected") {
-            return -1;
-         }
-         return 0;
-      }
-   } else {			# The write failed (e.g. partner disconnected).
-      $self->Transition("Disconnected");
-      $socket->close();
-      return -1;
-   }
-	
+	    } elsif ($self->{State} eq "SendingRequest") {
+		$self->Transition("ReceivingReply");
+		$self->{TimeoutRemaining} = $self->{TimeoutValue};
+	    } elsif ($self->{State} eq "Disconnected") {
+		return -1;
+	    }
+	    return 0;
+	}
+    } else {			# The write failed (e.g. partner disconnected).
+	$self->Transition("Disconnected");
+	$socket->close();
+	return -1;
+    }
+    
 }
 =pod
 
@@ -744,6 +746,7 @@ sub Shutdown {
 	    $socket->shutdown(2);
 	}
     }
+    $self->{Timeoutable}   = 0;	# Shutdown sockets can't timeout.
 }
 
 =pod