--- loncom/loncnew	2004/01/13 09:57:18	1.39
+++ loncom/loncnew	2004/02/09 13:39:28	1.41
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # lonc maintains the connections to remote computers
 #
-# $Id: loncnew,v 1.39 2004/01/13 09:57:18 foxr Exp $
+# $Id: loncnew,v 1.41 2004/02/09 13:39:28 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -63,11 +63,6 @@ use LONCAPA::Configuration;
 use LONCAPA::HashIterator;
 
 
-#
-#   Disable all signals we might receive from outside for now.
-#
-
-
 # Read the httpd configuration file to get perl variables
 # normally set in apache modules:
 
@@ -107,6 +102,7 @@ my $Status          = "";	# Current stat
 my $RecentLogEntry  = "";
 my $ConnectionRetries=2;	# Number of connection retries allowed.
 my $ConnectionRetriesLeft=2;	# Number of connection retries remaining.
+my $LondVersion     = "unknown"; # Version of lond we talk with.
 
 #
 #   The hash below gives the HTML format for log messages
@@ -695,6 +691,17 @@ The connection must echo the challenge b
 The challenge has been replied to.  The we are receiveing the 
 'ok' from the partner.
 
+=head3  State=ReadingVersionString
+
+We have requested the lond version and are reading the
+version back.  Upon completion, we'll store the version away
+for future use(?).
+
+=head3 State=HostSet
+
+We have selected the domain name of our peer (multhomed hosts)
+and are getting the reply (presumably ok) back.
+
 =head3 State=RequestingKey
 
 The ok has been received and we need to send the request for
@@ -749,7 +756,7 @@ sub LondReadable {
     &Debug(2, "Socket->Readable returned: $status");
 
     if($status != 0) {
-	 # bad return from socket read. Currently this means that
+	# bad return from socket read. Currently this means that
 	# The socket has become disconnected. We fail the transaction.
 
 	Log("WARNING",
@@ -767,19 +774,34 @@ sub LondReadable {
     $State = $Socket->GetState(); # Update in case of transition.
     &Debug(6, "After read, state is ".$State);
 
-   if($State eq "Initialized") {
+    if($State eq "Initialized") {
 
 
     } elsif ($State eq "ChallengeReceived") {
 	#  The challenge must be echoed back;  The state machine
 	# in the connection takes care of setting that up.  Just
 	# need to transition to writable:
-
+	
 	$Watcher->cb(\&LondWritable);
 	$Watcher->poll("w");
 
     } elsif ($State eq "ChallengeReplied") {
 
+    } elsif ($State eq "RequestingVersion") {
+	# Need to ask for the version... that is writiability:
+
+	$Watcher->cb(\&LondWritable);
+	$Watcher->poll("w");
+
+    } elsif ($State eq "ReadingVersionString") {
+	# Read the rest of the version string... 
+    } elsif ($State eq "SetHost") {
+	# Need to request the actual domain get set...
+
+	$Watcher->cb(\&LondWritable);
+	$Watcher->poll("w");
+    } elsif ($State eq "HostSet") {
+	# Reading the 'ok' from the peer.
 
     } elsif ($State eq "RequestingKey") {
 	#  The ok was received.  Now we need to request the key
@@ -791,6 +813,14 @@ sub LondReadable {
     } elsif ($State eq "ReceivingKey") {
 
     } elsif ($State eq "Idle") {
+   
+	# This is as good a spot as any to get the peer version
+	# string:
+   
+	if($LondVersion eq "unknown") {
+	    $LondVersion = $Socket->PeerVersion();
+	    Log("INFO", "Connected to lond version: $LondVersion");
+	}
 	# If necessary, complete a transaction and then go into the
 	# idle queue.
 	#  Note that a trasition to idle indicates a live lond
@@ -820,7 +850,7 @@ sub LondReadable {
 
 
     } else {
-	 # Invalid state.
+	# Invalid state.
 	Debug(4, "Invalid state in LondReadable");
     }
 }
@@ -914,9 +944,9 @@ sub LondWritable {
 	    KillSocket($Socket);
 	    return;
 	}
+      
 	#  "init" is being sent...
-
-	
+   
     } elsif ($State eq "Initialized")       {
 
 	# Now that init was sent, we switch 
@@ -924,7 +954,7 @@ sub LondWritable {
 
 	$Watcher->cb(\&LondReadable);
 	$Watcher->poll("r");
-
+	
     } elsif ($State eq "ChallengeReceived") {
 	# We received the challenge, now we 
 	# are echoing it back. This is a no-op,
@@ -943,6 +973,36 @@ sub LondWritable {
 
 	$Watcher->cb(\&LondReadable);
 	$Watcher->poll("r");
+    } elsif ($State eq "RequestingVersion") {
+	# Sending the peer a version request...
+      
+	if($Socket->Writable() != 0) {
+	    $Watcher->cancel();
+	    KillSocket($Socket);
+	    return;
+	}
+    } elsif ($State eq "ReadingVersionString") {
+	# Transition to read since we have sent the
+	# version command and now just need to read the
+	# version string from the peer:
+      
+	$Watcher->cb(\&LondReadable);
+	$Watcher->poll("r");
+      
+    } elsif ($State eq "SetHost") {
+	#  Setting the remote domain...
+      
+	if($Socket->Writable() != 0) {
+	    $Watcher->cancel();
+	    KillSocket($Socket);
+	    return;
+	}
+    } elsif ($State eq "HostSet") {
+	# Back to readable to get the ok.
+      
+	$Watcher->cb(\&LondReadable);
+	$Watcher->poll("r");
+      
 
     } elsif ($State eq "RequestingKey")     {
 	# At this time we're requesting the key.
@@ -966,6 +1026,7 @@ sub LondWritable {
 	$Watcher->poll("r");
 
     } elsif ($State eq "SendingRequest")    {
+ 
 	# At this time we are sending a request to the
 	# peer... write the next chunk: