--- loncom/LondConnection.pm 2004/03/02 11:14:38 1.27 +++ loncom/LondConnection.pm 2004/03/02 14:57:40 1.28 @@ -1,7 +1,7 @@ # This module defines and implements a class that represents # a connection to a lond daemon. # -# $Id: LondConnection.pm,v 1.27 2004/03/02 11:14:38 foxr Exp $ +# $Id: LondConnection.pm,v 1.28 2004/03/02 14:57:40 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -325,36 +325,36 @@ sub Readable { $self->Transition("ChallengeReceived"); $self->{TimeoutRemaining} = $self->{TimeoutValue}; return 0; - } 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 "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; - } - $self->Transition("RequestingKey"); - $self->{InformReadable} = 0; - $self->{InformWritable} = 1; - $self->{TransactionRequest} = "ekey\n"; - return 0; + if($self->{TransactionReply} ne "ok\n") { + $self->Transition("Disconnected"); + $socket->close(); + return -1; + } + $self->Transition("RequestingKey"); + $self->{InformReadable} = 0; + $self->{InformWritable} = 1; + $self->{TransactionRequest} = "ekey\n"; + return 0; } elsif ($self->{State} eq "ReceivingKey") { my $buildkey = $self->{TransactionReply}; my $key = $self->{LoncapaHim}.$perlvar{'lonHostID'};