--- loncom/LondConnection.pm 2003/12/08 20:32:17 1.19 +++ loncom/LondConnection.pm 2004/03/02 22:38:07 1.29 @@ -1,7 +1,7 @@ # This module defines and implements a class that represents # a connection to a lond daemon. # -# $Id: LondConnection.pm,v 1.19 2003/12/08 20:32:17 albertel Exp $ +# $Id: LondConnection.pm,v 1.29 2004/03/02 22:38:07 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -67,7 +67,7 @@ sub ReadConfig { my $perlvarref = read_conf('loncapa.conf'); %perlvar = %{$perlvarref}; my $hoststab = read_hosts( - "$perlvar{'lonTabDir'}/hosts.tab") || + "$perlvar{lonTabDir}/hosts.tab") || die "Can't read host table!!"; %hostshash = %{$hoststab}; $ConfigRead = 1; @@ -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,20 +199,21 @@ 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}, @@ -278,7 +279,15 @@ sub Readable { my $self = shift; my $socket = $self->{Socket}; my $data = ''; - my $rv = $socket->recv($data, POSIX::BUFSIZ, 0); + my $rv; + if ($socket) { + eval { + $rv = $socket->recv($data, POSIX::BUFSIZ, 0); + } + } else { + $self->Transition("Disconnected"); + return -1; + } my $errno = $! + 0; # Force numeric context. unless (defined($rv) && length $data) {# Read failed, @@ -299,7 +308,7 @@ sub Readable { &Debug(9,"Received from host: ".$data); $self->{TransactionReply} .= $data; - if($self->{TransactionReply} =~ /(.*\n)/) { + if($self->{TransactionReply} =~ m/\n$/) { &Debug(8,"Readable End of line detected"); if ($self->{State} eq "Initialized") { # We received the challenge: if($self->{TransactionReply} eq "refused\n") { # Remote doesn't have @@ -316,8 +325,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; @@ -393,7 +421,18 @@ Returns 0 if successful, or -1 if not. sub Writable { my $self = shift; # Get reference to the object. my $socket = $self->{Socket}; - my $nwritten = $socket->send($self->{TransactionRequest}, 0); + my $nwritten; + if ($socket) { + eval { + $nwritten = $socket->send($self->{TransactionRequest}, 0); + } + } else { + # For whatever reason, there's no longer a socket left. + + + $self->Transition("Disconnected"); + return -1; + } my $errno = $! + 0; unless (defined $nwritten) { if($errno != POSIX::EINTR) { @@ -408,35 +447,39 @@ sub Writable { ($errno == POSIX::EINTR) || ($errno == 0)) { substr($self->{TransactionRequest}, 0, $nwritten) = ""; # rmv written part - if(length $self->{TransactionRequest} == 0) { - $self->{InformWritable} = 0; - $self->{InformReadable} = 1; - $self->{TransactionReply} = ''; - # - # Figure out the next state: - # - if($self->{State} eq "Connected") { - $self->Transition("Initialized"); - } elsif($self->{State} eq "ChallengeReceived") { - $self->Transition("ChallengeReplied"); - } elsif($self->{State} eq "RequestingKey") { - $self->Transition("ReceivingKey"); - $self->{InformWritable} = 0; - $self->{InformReadable} = 1; - $self->{TransactionReply} = ''; - } elsif ($self->{State} eq "SendingRequest") { - $self->Transition("ReceivingReply"); - $self->{TimeoutRemaining} = $self->{TimeoutValue}; - } elsif ($self->{State} eq "Disconnected") { - return -1; - } - return 0; - } - } else { # The write failed (e.g. partner disconnected). - $self->Transition("Disconnected"); - $socket->close(); - return -1; - } + if(length $self->{TransactionRequest} == 0) { + $self->{InformWritable} = 0; + $self->{InformReadable} = 1; + $self->{TransactionReply} = ''; + # + # Figure out the next state: + # + if($self->{State} eq "Connected") { + $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} = ''; + } elsif ($self->{State} eq "SendingRequest") { + $self->Transition("ReceivingReply"); + $self->{TimeoutRemaining} = $self->{TimeoutValue}; + } elsif ($self->{State} eq "Disconnected") { + return -1; + } + return 0; + } + } else { # The write failed (e.g. partner disconnected). + $self->Transition("Disconnected"); + $socket->close(); + return -1; + } } =pod @@ -562,9 +605,15 @@ Shuts down the socket. sub Shutdown { my $self = shift; my $socket = $self->GetSocket(); - $socket->send("exit\n", 0); # Ask lond to exit too. Non blocking so - # there's no cost for failure. - $socket->shutdown(2); + Debug(5,"socket is -$socket-"); + if ($socket) { + # Ask lond to exit too. Non blocking so + # there is no cost for failure. + eval { + $socket->send("exit\n", 0); + $socket->shutdown(2); + } + } } =pod @@ -786,6 +835,9 @@ sub read_conf my %perlvar; foreach my $filename (@conf_files,'loncapa_apache.conf') { + if($DebugLevel > 3) { + print("Going to read $confdir.$filename\n"); + } open(CONFIG,'<'.$confdir.$filename) or die("Can't read $confdir$filename"); while (my $configline=) @@ -799,9 +851,15 @@ sub read_conf } close(CONFIG); } + if($DebugLevel > 3) { + print "Dumping perlvar:\n"; + foreach my $var (keys %perlvar) { + print "$var = $perlvar{$var}\n"; + } + } my $perlvarref=\%perlvar; - return ($perlvarref); - } + return $perlvarref; +} #---------------------- Subroutine read_hosts: Read a LON-CAPA hosts.tab # formatted configuration file. @@ -841,7 +899,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;