--- loncom/loncnew	2011/06/16 07:18:53	1.97
+++ loncom/loncnew	2018/09/02 15:57:16	1.100.10.1
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # lonc maintains the connections to remote computers
 #
-# $Id: loncnew,v 1.97 2011/06/16 07:18:53 raeburn Exp $
+# $Id: loncnew,v 1.100.10.1 2018/09/02 15:57:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -611,7 +611,7 @@ sub CompleteTransaction {
 	StartClientReply($Transaction, $data);
     } else {			# Delete deferred transaction file.
 	Log("SUCCESS", "A delayed transaction was completed");
-	LogPerm("S:".$Transaction->getClient().":".$Transaction->getRequest());
+	LogPerm("S:".$Socket->PeerLoncapaHim().":".$Transaction->getRequest());
 	unlink($Transaction->getFile());
     }
 }
@@ -772,6 +772,7 @@ sub KillSocket {
     #  work queue, the work all gets failed with con_lost.
     #
     if($ConnectionCount == 0) {
+	$LondConnecting = 0;	# No connections so also not connecting.
 	EmptyQueue();
 	CloseAllLondConnections; # Should all already be closed but...
     }
@@ -787,7 +788,7 @@ is readable.  The action is state depend
 
 =head3 State=Initialized
 
-We're waiting for the challenge, this is a no-op until the
+We are waiting for the challenge, this is a no-op until the
 state changes.
 
 =head3 State=Challenged 
@@ -824,7 +825,7 @@ The the key has been requested, now we a
 
 The encryption key has been negotiated or we have finished 
 reading data from the a transaction.   If the callback data have
-a client as well as the socket nformation, then we are 
+a client as well as the socket information, then we are 
 doing a transaction and the data received are relayed to the client
 before the socket is put on the idle list.
 
@@ -985,9 +986,9 @@ event.  The action taken is very state d
 =head3 State = Connected 
 
 The connection is in the process of sending the 'init' hailing to the
-lond on the remote end.  The connection object's Writable member is
-called.  On error, ConnectionError is called to destroy the connection
-and remove it from the ActiveConnections hash
+lond on the remote end.  The Writable member of the connection object
+is called.  On error, call ConnectionError to destroy the connection
+and remove it from the ActiveConnections hash.
 
 =head3 Initialized
 
@@ -1538,7 +1539,7 @@ sub GetServerPort {
 Setup a lonc listener event.  The event is called when the socket
 becomes readable.. that corresponds to the receipt of a new
 connection.  The event handler established will accept the connection
-(creating a communcations channel), that in turn will establish
+(creating a communications channel), that in turn will establish
 another event handler to subess requests.
 
 =head2  Parameters:
@@ -2232,8 +2233,8 @@ sub Terminate {
 }
 
 sub my_hostname {
-    use Sys::Hostname;
-    my $name = &hostname();
+    use Sys::Hostname::FQDN();
+    my $name = Sys::Hostname::FQDN::fqdn();
     &Debug(9,"Name is $name");
     return $name;
 }