version 1.35, 2004/09/21 10:51:42
|
version 1.36, 2005/02/06 07:39:49
|
Line 234 sub new {
|
Line 234 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 259 sub new {
|
Line 262 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 |
# If we are local, we'll first try local auth mode, otherwise, we'll try |
# the 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 1185 sub read_conf
|
Line 1188 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 1194 sub read_hosts {
|
Line 1197 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: |