--- loncom/LondConnection.pm	2003/04/18 06:07:27	1.3
+++ loncom/LondConnection.pm	2003/09/15 09:25:57	1.10
@@ -1,7 +1,7 @@
 #   This module defines and implements a class that represents
 #   a connection to a lond daemon.
 #
-# $Id: LondConnection.pm,v 1.3 2003/04/18 06:07:27 albertel Exp $
+# $Id: LondConnection.pm,v 1.10 2003/09/15 09:25:57 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,6 +27,7 @@
 #
 package LondConnection;
 
+use strict;
 use IO::Socket;
 use IO::Socket::INET;
 use IO::Handle;
@@ -37,7 +38,7 @@ use Crypt::IDEA;
 use LONCAPA::Configuration;
 use LONCAPA::HashIterator;
 
-my $DebugLevel=4;
+my $DebugLevel=0;
 
 #   Read the configuration file for apache to get the perl
 #   variable set.
@@ -70,6 +71,8 @@ Dump the internal state of the object: F
 
 sub Dump {
     my $self   = shift;
+    my $key;
+    my $value;
     print "Dumping LondConnectionObject:\n";
     while(($key, $value) = each %$self) {
 	print "$key -> $value\n";
@@ -145,15 +148,16 @@ sub new {
 		     TimeoutCallback    => undef,
 		     TransitionCallback => undef,
 	             Timeoutable        => 0,
-	             TimeoutValue       => 60,
-             TimeoutRemaining   => 0,
+	             TimeoutValue       => 30,
+		     TimeoutRemaining   => 0,
 		     CipherKey          => "",
 		     Cipher             => undef};
     bless($self, $class);
     unless ($self->{Socket} = IO::Socket::INET->new(PeerHost => $self->{Host},
 					       PeerPort => $self->{Port},
 					       Type     => SOCK_STREAM,
-					       Proto    => "tcp")) {
+					       Proto    => "tcp",
+					       Timeout  => 5)) {
 	return undef;		# Inidicates the socket could not be made.
     }
     #
@@ -161,13 +165,14 @@ sub new {
     #
     $self->Transition("Connected");
     $self->{InformWritable}     = 1;    # When  socket is writable we send init
+    $self->{Timeoutable}        = 1;    # Timeout allowed during startup negotiation. 
     $self->{TransactionRequest} = "init\n";
     
     #
     # Set socket to nonblocking I/O.
     #
     my $socket = $self->{Socket};
-    $flags    = fcntl($socket->fileno, F_GETFL,0);
+    my $flags    = fcntl($socket->fileno, F_GETFL,0);
     if($flags == -1) {
 	$socket->close;
 	return undef;
@@ -215,11 +220,10 @@ sub Readable {
     my $rv      = $socket->recv($data, POSIX::BUFSIZ,  0);
     my $errno   = $! + 0;	             # Force numeric context.
 
-    unless (defined($rv) && length($data)) { # Read failed,
+    unless (defined($rv) && length $data) {# Read failed,
 	if(($errno == POSIX::EWOULDBLOCK)   ||
 	   ($errno == POSIX::EAGAIN)        ||
-	   ($errno == POSIX::EINTR)         ||
-	   ($errno == 0)) {
+	   ($errno == POSIX::EINTR)) {
 	    return 0;
 	}
 
@@ -237,7 +241,7 @@ sub Readable {
     if($self->{TransactionReply} =~ /(.*\n)/) {
 	&Debug(8,"Readable End of line detected");
 	if ($self->{State}  eq "Initialized") { # We received the challenge:
-	    if($self->{TransactionReply} eq "refused") {	# Remote doesn't have
+	    if($self->{TransactionReply} eq "refused\n") {	# Remote doesn't have
 		
 		$self->Transition("Disconnected"); # in host tables.
 		$socket->close();
@@ -337,7 +341,7 @@ sub Writable {
 	}
       
     }
-    if (($rv >= 0)                        ||
+    if (($nwritten >= 0)                        ||
         ($errno == POSIX::EWOULDBLOCK)    ||
 	($errno == POSIX::EAGAIN)         ||
 	($errno == POSIX::EINTR)          ||
@@ -430,7 +434,9 @@ sub InitiateTransaction {
     my $self   = shift;
     my $data   = shift;
 
+    Debug(1, "initiating transaction: ".$data);
     if($self->{State} ne "Idle") {
+	Debug(0," .. but not idle here\n");
 	return -1;		# Error indicator.
     }
     # if the transaction is to be encrypted encrypt the data:
@@ -486,6 +492,20 @@ sub SetTimeoutCallback {
 
 =pod
 
+=head2 Shutdown:
+
+Shuts down the socket.
+
+=cut
+
+sub Shutdown {
+    my $self = shift;
+    my $socket = $self->GetSocket();
+    $socket->shutdown(2);
+}
+
+=pod
+
 =head2 GetState
 
 selector for the object state.
@@ -510,6 +530,7 @@ sub GetSocket {
     return $self->{Socket};
 }
 
+
 =pod
 
 =head2 WantReadable
@@ -637,7 +658,7 @@ sub Decrypt {
     # Decode the data in 8 byte blocks.  The string is encoded
     # as hex digits so there are two characters per byte:
 
-    $decrpyted = "";
+    my $decrypted = "";
     for(my $index = 0; $index < length($EncryptedString);
 	$index += 16) {
 	$decrypted .= $self->{Cipher}->decrypt(
@@ -836,6 +857,10 @@ peer (assumes the text is a command).
 Decrypts a block of text according to the cipher negotiated with the
 peer (assumes the block was a reply.
 
+=item Shutdown:
+
+Shuts off the socket.
+
 =head2 The following are selector member functions:
 
 =item GetState: