--- loncom/LondConnection.pm	2003/12/22 11:03:17	1.21
+++ loncom/LondConnection.pm	2004/02/09 13:33:16	1.25
@@ -1,7 +1,7 @@
 #   This module defines and implements a class that represents
 #   a connection to a lond daemon.
 #
-# $Id: LondConnection.pm,v 1.21 2003/12/22 11:03:17 foxr Exp $
+# $Id: LondConnection.pm,v 1.25 2004/02/09 13:33:16 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -127,11 +127,11 @@ sub Dump {
     my $self   = shift;
     my $key;
     my $value;
-    print "Dumping LondConnectionObject:\n";
+    print STDERR "Dumping LondConnectionObject:\n";
     while(($key, $value) = each %$self) {
-	print "$key -> $value\n";
+	print STDERR "$key -> $value\n";
     }
-    print "-------------------------------\n";
+    print STDERR "-------------------------------\n";
 }
 
 =pod
@@ -199,26 +199,27 @@ sub new {
     Debug(5, "Connecting to ".$DnsName);
     # Now create the object...
     my $self     = { Host               => $DnsName,
-		     LoncapaHim         => $Hostname,
-	             Port               => $Port,
-	             State              => "Initialized",
-	             TransactionRequest => "",
-	             TransactionReply   => "",
-	             InformReadable     => 0,
-	             InformWritable     => 0,
-		     TimeoutCallback    => undef,
-		     TransitionCallback => undef,
-	             Timeoutable        => 0,
-	             TimeoutValue       => 30,
-		     TimeoutRemaining   => 0,
-		     CipherKey          => "",
-		     Cipher             => undef};
+                     LoncapaHim         => $Hostname,
+                     Port               => $Port,
+                     State              => "Initialized",
+                     TransactionRequest => "",
+                     TransactionReply   => "",
+                     InformReadable     => 0,
+                     InformWritable     => 0,
+                     TimeoutCallback    => undef,
+                     TransitionCallback => undef,
+                     Timeoutable        => 0,
+                     TimeoutValue       => 30,
+                     TimeoutRemaining   => 0,
+                     CipherKey          => "",
+                     LondVersion        => "Unknown",
+                     Cipher             => undef};
     bless($self, $class);
     unless ($self->{Socket} = IO::Socket::INET->new(PeerHost => $self->{Host},
-					       PeerPort => $self->{Port},
-					       Type     => SOCK_STREAM,
-					       Proto    => "tcp",
-					       Timeout  => 3)) {
+						    PeerPort => $self->{Port},
+						    Type     => SOCK_STREAM,
+						    Proto    => "tcp",
+						    Timeout  => 3)) {
 	return undef;		# Inidicates the socket could not be made.
     }
     #
@@ -308,7 +309,7 @@ sub Readable {
 		$socket->close();
 		return -1;
 	    }
-
+	    
 	    &Debug(8," Transition out of Initialized");
 	    $self->{TransactionRequest} = $self->{TransactionReply};
 	    $self->{InformWritable}     = 1;
@@ -316,8 +317,27 @@ sub Readable {
 	    $self->Transition("ChallengeReceived");
 	    $self->{TimeoutRemaining}   = $self->{TimeoutValue};
 	    return 0;
-	} elsif ($self->{State} eq "ChallengeReplied") { # should be ok.
-	    if($self->{TransactionReply} != "ok\n") {
+	}  elsif ($self->{State} eq "ChallengeReplied") {
+	    if($self->{TransactionReply} ne "ok\n") {
+		$self->Transition("Disconnected");
+		$socket->close();
+		return -1;
+	    }
+	    $self->Transition("RequestingVersion");
+	    $self->{InformReadable}   = 0;
+	    $self->{InformWritable}   = 1;
+	    $self->{TransactionRequest} = "version\n";
+	    return 0;
+	} elsif ($self->{State} eq "ReadingVersionString") {
+	    $self->{LondVersion}       = chomp($self->{TransactionReply});
+	    $self->Transition("SetHost");
+	    $self->{InformReadable}    = 0;
+	    $self->{InformWritable}    = 1;
+	    my $peer = $self->{LoncapaHim};
+	    $self->{TransactionRequest}= "sethost:$peer\n";
+	    return 0;
+	} elsif ($self->{State} eq "HostSet") { # should be ok.
+	    if($self->{TransactionReply} ne "ok\n") {
 		$self->Transition("Disconnected");
 		$socket->close();
 		return -1;
@@ -375,7 +395,7 @@ sub Readable {
     }
 
     return 0;
-    
+
 }
 
 
@@ -390,6 +410,7 @@ mark the object as waiting for readabili
 Returns  0 if successful, or -1 if not.
 
 =cut
+
 sub Writable {
     my $self     = shift;		# Get reference to the object.
     my $socket   = $self->{Socket};
@@ -419,11 +440,15 @@ sub Writable {
 		$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} = '';
+#            $self->{InformWritable} = 0;
+#            $self->{InformReadable} = 1;
+#            $self->{TransactionReply} = '';
 	    } elsif ($self->{State} eq "SendingRequest") {
 		$self->Transition("ReceivingReply");
 		$self->{TimeoutRemaining} = $self->{TimeoutValue};
@@ -437,8 +462,8 @@ sub Writable {
 	$socket->close();
 	return -1;
     }
-	
 }
+
 =pod
 
 =head2 Tick
@@ -856,7 +881,17 @@ sub read_hosts {
     my $hostref = \%HostsTab;
     return ($hostref);
 }
-
+#
+#   Get the version of our peer.  Note that this is only well
+#   defined if the state machine has hit the idle state at least
+#   once (well actually if it has transitioned out of 
+#   ReadingVersionString   The member data LondVersion is returned.
+#
+sub PeerVersion {
+   my $self = shift;
+   
+   return $self->{LondVersion};
+}
 
 1;