use CmdAlias;
use Filter;
use Local;
+use DXDb;
+use Data::Dumper;
+
use Fcntl ':flock';
-use Carp;
+use Carp qw(cluck);
package main;
@inqueue = (); # the main input queue, an array of hashes
$systime = 0; # the time now (in seconds)
-$version = "1.28"; # the version no of the software
+$version = "1.37"; # the version no of the software
$starttime = 0; # the starting time of the cluster
$lockfn = "cluster.lock"; # lock file name
+@outstanding_connects = (); # list of outstanding connects
# handle disconnections
sub disconnect
sleep(1);
dbg('chan', "-> Z $call bye\n");
$conn->send_now("Z$call|bye"); # this will cause 'client' to disconnect
+ sleep(1);
+ $conn->disconnect();
}
# handle incoming messages
my $dxchan = DXChannel->get_by_cnum($conn); # get the dxconnnect object for this message
if (defined $err && $err) {
- disconnect($dxchan) if defined $dxchan;
+ if ($dxchan) {
+ $dxchan->disconnect;
+ }
return;
}
# set up the basic channel info - this needs a bit more thought - there is duplication here
if (!defined $dxchan) {
my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
-
- # is there one already connected to me ?
- if ($dxchan = DXChannel->get($call)) {
- disconnect($dxchan);
- sleep(1);
- }
-
- # is there one already connected elsewhere in the cluster (and not a cluster)
+
+ # is there one already connected to me - locally?
my $user = DXUser->get($call);
+ if (DXChannel->get($call)) {
+ my $mess = DXM::msg($lang, ($user && $user->sort eq 'A') ? 'concluster' : 'conother', $call);
+ already_conn($conn, $call, $mess);
+ return;
+ }
+
+ # is there one already connected elsewhere in the cluster?
if ($user) {
if (($user->sort eq 'A' || $call eq $myalias) && !DXCluster->get_exact($call)) {
;
} else {
- if (DXCluster->get($call) || DXChannel->get($call)) {
+ if (DXCluster->get_exact($call)) {
my $mess = DXM::msg($lang, $user->sort eq 'A' ? 'concluster' : 'conother', $call);
already_conn($conn, $call, $mess);
return;
}
$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
} else {
- if (DXCluster->get($call)) {
+ if (DXCluster->get_exact($call)) {
my $mess = DXM::msg($lang, 'conother', $call);
already_conn($conn, $call, $mess);
return;
# create the channel
$dxchan = DXCommandmode->new($call, $conn, $user) if ($user->sort eq 'U');
$dxchan = DXProt->new($call, $conn, $user) if ($user->sort eq 'A');
+ $dxchan = BBS->new($call, $conn, $user) if ($user->sort eq 'B');
die "Invalid sort of user on $call = $sort" if !$dxchan;
}
Local::finish(); # end local processing
};
dbg('local', "Local::finish error $@") if $@;
-
+
+ # disconnect nodes
foreach $dxchan (DXChannel->get_all()) {
+ next unless $dxchan->is_ak1a;
disconnect($dxchan) unless $dxchan == $DXProt::me;
}
Msg->event_loop(1, 0.05);
Msg->event_loop(1, 0.05);
Msg->event_loop(1, 0.05);
Msg->event_loop(1, 0.05);
+
+ # disconnect users
+ foreach $dxchan (DXChannel->get_all()) {
+ next if $dxchan->is_ak1a;
+ disconnect($dxchan) unless $dxchan == $DXProt::me;
+ }
Msg->event_loop(1, 0.05);
Msg->event_loop(1, 0.05);
Msg->event_loop(1, 0.05);
Msg->event_loop(1, 0.05);
Msg->event_loop(1, 0.05);
DXUser::finish();
+
+ # close all databases
+ DXDb::closeall;
+
dbg('chan', "DXSpider version $version ended");
Log('cluster', "DXSpider V$version stopped");
+ dbgclose();
+ Logclose();
unlink $lockfn;
+# $SIG{__WARN__} = $SIG{__DIE__} = sub {my $a = shift; cluck($a); };
exit(0);
}
{
$SIG{'CHLD'} = \&reap;
my $cpid = wait;
+ @outstanding_connects = grep {$_->{pid} != $cpid} @outstanding_connects;
}
# this is where the input queue is dealt with and things are dispatched off to other parts of
my $data = $self->{data};
my $dxchan = $self->{dxchan};
- my ($sort, $call, $line) = $data =~ /^(\w)(\S+)\|(.*)$/;
+ my ($sort, $call, $line) = $data =~ /^(\w)([A-Z0-9\-]+)\|(.*)$/;
+ my $error;
+
+ # the above regexp must work
+ return unless ($sort && $call && $line);
+
+ # translate any crappy characters into hex characters
+ if ($line =~ /[\x00-\x06\x08\x0a-\x1f\x7f-\xff]/o) {
+ $line =~ s/([\x00-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
+ }
# do the really sexy console interface bit! (Who is going to do the TK interface then?)
dbg('chan', "<- $sort $call $line\n") unless $sort eq 'D';
-
+
# handle A records
my $user = $dxchan->user;
if ($sort eq 'A' || $sort eq 'O') {
$dxchan->start($line, $sort);
} elsif ($sort eq 'I') {
die "\$user not defined for $call" if !defined $user;
-
# normal input
$dxchan->normal($line);
-
disconnect($dxchan) if ($dxchan->{state} eq 'bye');
} elsif ($sort eq 'Z') {
+ $dxchan->conn(undef);
disconnect($dxchan);
} elsif ($sort eq 'D') {
; # ignored (an echo)
$starttime = $systime = time;
# open the debug file, set various FHs to be unbuffered
+dbginit();
foreach (@debug) {
dbgadd($_);
}
Log('cluster', "DXSpider V$version started");
# banner
-print "DXSpider DX Cluster Version $version\nCopyright (c) 1998 Dirk Koopman G1TLH\n";
+print "DXSpider DX Cluster Version $version\nCopyright (c) 1998-1999 Dirk Koopman G1TLH\n";
# load Prefixes
print "loading prefixes ...\n";
print "reading cron jobs ...\n";
DXCron->init();
+# read in database descriptors
+print "reading database descriptors ...\n";
+DXDb::load();
+
# starting local stuff
print "doing local initialisation ...\n";
eval {
dbg('chan', "DXSpider version $version started...");
for (;;) {
my $timenow;
- Msg->event_loop(1, 0.001);
+ Msg->event_loop(1, 0.1);
$timenow = time;
process_inqueue(); # read in lines from the input queue and despatch them
DXCommandmode::process(); # process ongoing command mode stuff
DXProt::process(); # process ongoing ak1a pcxx stuff
DXConnect::process();
+ DXMsg::process();
+ DXDb::process();
eval {
Local::process(); # do any localised processing
};
projects / spider.git / blobdiff