version 1.32, 2004/06/17 10:15:46
|
version 1.38, 2006/01/26 21:34:25
|
Line 154 Dump the internal state of the object: F
|
Line 154 Dump the internal state of the object: F
|
sub Dump { |
sub Dump { |
my $self = shift; |
my $self = shift; |
my $level = shift; |
my $level = shift; |
|
my $now = time; |
|
my $local = localtime($now); |
|
|
if ($level <= $DebugLevel) { |
if ($level >= $DebugLevel) { |
return; |
return; |
} |
} |
|
|
|
|
my $key; |
my $key; |
my $value; |
my $value; |
print STDERR "Dumping LondConnectionObject:\n"; |
print STDERR "[ $local ] Dumping LondConnectionObject:\n"; |
|
print STDERR join(':',caller(1))."\n"; |
while(($key, $value) = each %$self) { |
while(($key, $value) = each %$self) { |
print STDERR "$key -> $value\n"; |
print STDERR "$key -> $value\n"; |
} |
} |
Line 231 sub new {
|
Line 235 sub new {
|
my @ConfigLine = @{$hostshash{$Hostname}}; |
my @ConfigLine = @{$hostshash{$Hostname}}; |
my $DnsName = $ConfigLine[3]; # 4'th item is dns of host. |
my $DnsName = $ConfigLine[3]; # 4'th item is dns of host. |
Debug(5, "Connecting to ".$DnsName); |
Debug(5, "Connecting to ".$DnsName); |
|
# if it is me use loopback for connection |
|
if ($DnsName eq $LocalDns) { $DnsName="127.0.0.1"; } |
|
Debug(8, "Connecting to $DnsName I am $LocalDns"); |
# Now create the object... |
# Now create the object... |
my $self = { Host => $DnsName, |
my $self = { Host => $DnsName, |
LoncapaHim => $Hostname, |
LoncapaHim => $Hostname, |
Line 256 sub new {
|
Line 263 sub new {
|
Type => SOCK_STREAM, |
Type => SOCK_STREAM, |
Proto => "tcp", |
Proto => "tcp", |
Timeout => 3)) { |
Timeout => 3)) { |
|
Debug(8, "Error? \n$@ \n$!"); |
return undef; # Inidicates the socket could not be made. |
return undef; # Inidicates the socket could not be made. |
} |
} |
my $socket = $self->{Socket}; # For local use only. |
my $socket = $self->{Socket}; # For local use only. |
# If we are local, we'll first try local auth mode, otherwise, we'll try the |
# If we are local, we'll first try local auth mode, otherwise, we'll try |
# ssl auth mode: |
# the ssl auth mode: |
|
|
Debug(8, "Connecting to $DnsName I am $LocalDns"); |
|
my $key; |
my $key; |
my $keyfile; |
my $keyfile; |
if ($DnsName eq $LocalDns) { |
if ($DnsName eq '127.0.0.1') { |
$self->{AuthenticationMode} = "local"; |
$self->{AuthenticationMode} = "local"; |
($key, $keyfile) = lonlocal::CreateKeyFile(); |
($key, $keyfile) = lonlocal::CreateKeyFile(); |
Debug(8, "Local key: $key, stored in $keyfile"); |
Debug(8, "Local key: $key, stored in $keyfile"); |
Line 290 sub new {
|
Line 297 sub new {
|
return undef; |
return undef; |
} |
} |
|
|
} |
} |
else { |
else { |
$self->{AuthenticationMode} = "ssl"; |
# Remote peer: I'd like to do ssl, but if my host key or certificates |
$self->{TransactionRequest} = "init:ssl\n"; |
# are not all installed, my only choice is insecure, if that's |
|
# allowed: |
|
|
|
my ($ca, $cert) = lonssl::CertificateFile; |
|
my $sslkeyfile = lonssl::KeyFile; |
|
|
|
if((defined $ca) && (defined $cert) && (defined $sslkeyfile)) { |
|
|
|
$self->{AuthenticationMode} = "ssl"; |
|
$self->{TransactionRequest} = "init:ssl\n"; |
|
} else { |
|
if($InsecureOk) { # Allowed to do insecure: |
|
$self->{AuthenticationMode} = "insecure"; |
|
$self->{TransactionRequest} = "init\n"; |
|
} |
|
else { # Not allowed to do insecure... |
|
$socket->close; |
|
return undef; |
|
} |
|
} |
} |
} |
|
|
# |
# |
Line 482 sub Readable {
|
Line 508 sub Readable {
|
return 0; |
return 0; |
|
|
} elsif ($self->{State} eq "ReadingVersionString") { |
} elsif ($self->{State} eq "ReadingVersionString") { |
$self->{LondVersion} = chomp($self->{TransactionReply}); |
chomp($self->{TransactionReply}); |
|
$self->{LondVersion} = $self->{TransactionReply}; |
$self->Transition("SetHost"); |
$self->Transition("SetHost"); |
$self->{InformReadable} = 0; |
$self->{InformReadable} = 0; |
$self->{InformWritable} = 1; |
$self->{InformWritable} = 1; |
Line 533 sub Readable {
|
Line 560 sub Readable {
|
my $answer = $self->{TransactionReply}; |
my $answer = $self->{TransactionReply}; |
if($answer =~ /^enc\:/) { |
if($answer =~ /^enc\:/) { |
$answer = $self->Decrypt($answer); |
$answer = $self->Decrypt($answer); |
$self->{TransactionReply} = $answer; |
$self->{TransactionReply} = "$answer\n"; |
} |
} |
|
|
# finish the transaction |
# finish the transaction |
Line 931 sub Decrypt {
|
Line 958 sub Decrypt {
|
# $length tells us the actual length of the decrypted string: |
# $length tells us the actual length of the decrypted string: |
|
|
$decrypted = substr($decrypted, 0, $length); |
$decrypted = substr($decrypted, 0, $length); |
|
Debug(9, "Decrypted $EncryptedString to $decrypted"); |
|
|
return $decrypted; |
return $decrypted; |
|
|
Line 1162 sub read_conf
|
Line 1190 sub read_conf
|
#---------------------- Subroutine read_hosts: Read a LON-CAPA hosts.tab |
#---------------------- Subroutine read_hosts: Read a LON-CAPA hosts.tab |
# formatted configuration file. |
# formatted configuration file. |
# |
# |
my $RequiredCount = 5; # Required item count in hosts.tab. |
my $RequiredCount = 4; # Required item count in hosts.tab. |
my $DefaultMaxCon = 5; # Default value for maximum connections. |
my $DefaultMaxCon = 5; # Default value for maximum connections. |
my $DefaultIdle = 1000; # Default connection idle time in seconds. |
my $DefaultIdle = 1000; # Default connection idle time in seconds. |
my $DefaultMinCon = 0; # Default value for minimum connections. |
my $DefaultMinCon = 0; # Default value for minimum connections. |
Line 1171 sub read_hosts {
|
Line 1199 sub read_hosts {
|
my $Filename = shift; |
my $Filename = shift; |
my %HostsTab; |
my %HostsTab; |
|
|
open(CONFIG,'<'.$Filename) or die("Can't read $Filename"); |
open(CONFIG,'<'.$Filename) or die("Can't read $Filename"); |
while (my $line = <CONFIG>) { |
while (my $line = <CONFIG>) { |
if (!($line =~ /^\s*\#/)) { |
if ($line !~ /^\s*\#/) { |
|
$line=~s/\s*$//; |
my @items = split(/:/, $line); |
my @items = split(/:/, $line); |
if(scalar @items >= $RequiredCount) { |
if(scalar @items >= $RequiredCount) { |
if (scalar @items == $RequiredCount) { # Only required items: |
if (scalar @items == $RequiredCount) { # Only required items: |