--- loncom/LondConnection.pm 2003/10/28 10:47:44 1.14 +++ loncom/LondConnection.pm 2004/02/09 13:33:16 1.25 @@ -1,7 +1,7 @@ # This module defines and implements a class that represents # a connection to a lond daemon. # -# $Id: LondConnection.pm,v 1.14 2003/10/28 10:47:44 foxr Exp $ +# $Id: LondConnection.pm,v 1.25 2004/02/09 13:33:16 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -46,6 +46,13 @@ my %hostshash; my %perlvar; # +# Set debugging level +# +sub SetDebug { + $DebugLevel = shift; +} + +# # The config read is done in this way to support the read of # the non-default configuration file in the # event we are being used outside of loncapa. @@ -60,14 +67,45 @@ 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; - close(CONFIG); } +# +# Read a foreign configuration. +# This sub is intended for the cases where the package +# will be read from outside the LonCAPA environment, in that case +# the client will need to explicitly provide: +# - A file in hosts.tab format. +# - Some idea of the 'lonCAPA' name of the local host (for building +# the encryption key). +# +# Parameters: +# MyHost - Name of this host as far as LonCAPA is concerned. +# Filename - Name of a hosts.tab formatted file that will be used +# to build up the hosts table. +# +sub ReadForeignConfig { + my $MyHost = shift; + my $Filename = shift; + + &Debug(4, "ReadForeignConfig $MyHost $Filename\n"); + $perlvar{lonHostID} = $MyHost; # Rmember my host. + my $hosttab = read_hosts($Filename) || + die "Can't read hosts table!!"; + %hostshash = %{$hosttab}; + if($DebugLevel > 3) { + foreach my $host (keys %hostshash) { + print "host $host => $hostshash{$host}\n"; + } + } + $ConfigRead = 1; + +} sub Debug { my $level = shift; @@ -89,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 STDERR "$key -> $value\n"; } - print "-------------------------------\n"; + print STDERR "-------------------------------\n"; } =pod @@ -153,6 +191,7 @@ sub new { # LoncapaHim fields of the object respectively. # if (!exists $hostshash{$Hostname}) { + &Debug(8, "No Such host $Hostname"); return undef; # No such host!!! } my @ConfigLine = @{$hostshash{$Hostname}}; @@ -160,26 +199,27 @@ 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}, - Type => SOCK_STREAM, - Proto => "tcp", - Timeout => 3)) { + PeerPort => $self->{Port}, + Type => SOCK_STREAM, + Proto => "tcp", + Timeout => 3)) { return undef; # Inidicates the socket could not be made. } # @@ -269,7 +309,7 @@ sub Readable { $socket->close(); return -1; } - + &Debug(8," Transition out of Initialized"); $self->{TransactionRequest} = $self->{TransactionReply}; $self->{InformWritable} = 1; @@ -277,8 +317,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; @@ -336,7 +395,7 @@ sub Readable { } return 0; - + } @@ -351,6 +410,7 @@ mark the object as waiting for readabili Returns 0 if successful, or -1 if not. =cut + sub Writable { my $self = shift; # Get reference to the object. my $socket = $self->{Socket}; @@ -380,11 +440,15 @@ sub Writable { $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} = ''; +# $self->{InformWritable} = 0; +# $self->{InformReadable} = 1; +# $self->{TransactionReply} = ''; } elsif ($self->{State} eq "SendingRequest") { $self->Transition("ReceivingReply"); $self->{TimeoutRemaining} = $self->{TimeoutValue}; @@ -398,8 +462,8 @@ sub Writable { $socket->close(); return -1; } - } + =pod =head2 Tick @@ -523,7 +587,15 @@ Shuts down the socket. sub Shutdown { my $self = shift; my $socket = $self->GetSocket(); - $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 @@ -745,6 +817,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=) @@ -758,9 +833,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. @@ -774,7 +855,7 @@ sub read_hosts { my $Filename = shift; my %HostsTab; - open(CONFIG,'<'.$Filename) or die("Can't read $Filename"); + open(CONFIG,'<'.$Filename) or die("Can't read $Filename"); while (my $line = ) { if (!($line =~ /^\s*\#/)) { my @items = split(/:/, $line); @@ -800,7 +881,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;