--- loncom/loncnew	2004/05/25 15:32:13	1.46
+++ loncom/loncnew	2004/07/02 09:28:14	1.50
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # lonc maintains the connections to remote computers
 #
-# $Id: loncnew,v 1.46 2004/05/25 15:32:13 albertel Exp $
+# $Id: loncnew,v 1.50 2004/07/02 09:28:14 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -82,7 +82,7 @@ my $ClientConnection = 0;	# Uniquifier f
 
 my $DebugLevel = 0;
 my $NextDebugLevel= 2;		# So Sigint can toggle this.
-my $IdleTimeout= 3600;		# Wait an hour before pruning connections.
+my $IdleTimeout= 600;		# Wait 10 minutes before pruning connections.
 
 my $LogTransactions = 0;	# When True, all transactions/replies get logged.
 
@@ -103,6 +103,7 @@ 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.
+my $KeyMode         = "";       # e.g. ssl, local, insecure from last connect.
 
 #
 #   The hash below gives the HTML format for log messages
@@ -156,9 +157,9 @@ host and the time will be formatted into
 =cut
 
 sub Log {
-    my $severity = shift;
-    my $message  = shift;
-   
+
+    my ($severity, $message) = @_;
+
     if(!$LogFormats{$severity}) {
 	$severity = "DEFAULT";
     }
@@ -193,8 +194,10 @@ Returns the name of the host that a sock
 =cut
 
 sub GetPeername {
-    my $connection = shift;
-    my $AdrFamily  = shift;
+
+
+    my ($connection, $AdrFamily) = @_;
+
     my $peer       = $connection->peername();
     my $peerport;
     my $peerip;
@@ -217,18 +220,20 @@ Invoked to issue a debug message.
 =cut
 
 sub Debug {
-    my $level   = shift;
-    my $message = shift;
+
+    my ($level, $message) = @_;
+
     if ($level <= $DebugLevel) {
 	Log("INFO", "-Debug- $message host = $RemoteHost");
     }
 }
 
 sub SocketDump {
-    my $level = shift;
-    my $socket= shift;
+
+    my ($level, $socket) = @_;
+
     if($level <= $DebugLevel) {
-	$socket->Dump();
+	$socket->Dump(-1);	# Ensure it will get dumped.
     }
 }
 
@@ -261,7 +266,7 @@ sub SocketTimeout {
     my $Socket = shift;
     Log("WARNING", "A socket timeout was detected");
     Debug(0, " SocketTimeout called: ");
-    $Socket->Dump();
+    $Socket->Dump(0);
     if(exists($ActiveTransactions{$Socket})) {
 	FailTransaction($ActiveTransactions{$Socket});
     }
@@ -288,7 +293,8 @@ sub Tick {
     my $client;
     if($ConnectionRetriesLeft > 0) {
 	ShowStatus(GetServerHost()." Connection count: ".$ConnectionCount
-		   ." Retries remaining: ".$ConnectionRetriesLeft);
+		   ." Retries remaining: ".$ConnectionRetriesLeft
+		   ." ($KeyMode)");
     } else {
 	ShowStatus(GetServerHost()." >> DEAD <<");
     }
@@ -343,6 +349,9 @@ sub Tick {
 	}
        
     }
+    if ($ConnectionCount == 0) {
+	$KeyMode = ""; 
+    }
 }
 
 =pod
@@ -383,6 +392,7 @@ long enough, it will be shut down and re
 
 sub ServerToIdle {
     my $Socket   = shift;	# Get the socket.
+    $KeyMode = $Socket->{AuthenticationMode};
     delete($ActiveTransactions{$Socket}); # Server has no transaction
 
     &Debug(5, "Server to idle");
@@ -515,8 +525,8 @@ The transaction that is being completed.
 
 sub CompleteTransaction {
     &Debug(5,"Complete transaction");
-    my $Socket = shift;
-    my $Transaction = shift;
+
+    my ($Socket, $Transaction) = @_;
 
     if (!$Transaction->isDeferred()) { # Normal transaction
 	my $data   = $Socket->GetReply(); # Data to send.
@@ -550,9 +560,8 @@ sub CompleteTransaction {
 =cut
 
 sub StartClientReply {
-    my $Transaction   = shift;
-    my $data     = shift;
 
+    my ($Transaction, $data) = @_;
 
     my $Client   = $Transaction->getClient();
 
@@ -1164,8 +1173,8 @@ The text of the request to send.
 =cut
 
 sub StartRequest {
-    my $Lond     = shift;
-    my $Request  = shift;	# This is a LondTransaction.
+
+    my ($Lond, $Request) = @_;
     
     Debug(6, "StartRequest: ".$Request->getRequest());
 
@@ -1438,7 +1447,7 @@ sub ChildStatus {
 	    my $state  = $Socket->GetState();
 	    print $fh "Connection $i State: $state\n";
 	    print STDERR "---------------------- Connection $i \n";
-	    $Socket->Dump();
+	    $Socket->Dump(-1);	# Ensure it gets dumped..
 	    $i++;	
 	}
     }