# try to create and lock a lockfile (this isn't atomic but
# should do for now
- $lockfn = "$root/perl/cluster.lock"; # lock file name
+ my $lockfn = "$root/perl/cluster.lock"; # lock file name
if (-e $lockfn) {
open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
my $pid = <CLLOCK>;
}
use Msg;
+use IntMsg;
+use ExtMsg;
use DXVars;
use DXDebug;
use DXLog;
use Geomag;
use CmdAlias;
use Filter;
-use Local;
use DXDb;
-use Data::Dumper;
+use AnnTalk;
+use WCY;
+use DXDupe;
+use BadWords;
+use Data::Dumper;
use Fcntl ':flock';
+use POSIX ":sys_wait_h";
-use Carp qw(cluck);
+use Local;
package main;
+#use strict;
+#use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects $zombies $root
+# $lang $myalias @debug $userfn $clusteraddr $clusterport $mycall $decease );
+
@inqueue = (); # the main input queue, an array of hashes
$systime = 0; # the time now (in seconds)
-$version = "1.36"; # the version no of the software
+$version = "1.47"; # 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
-{
- my $dxchan = shift;
- return if !defined $dxchan;
- $dxchan->disconnect();
-}
+@listeners = (); # list of listeners
+
# send a message to call on conn and disconnect
sub already_conn
{
dbg('chan', "-> Z $call bye\n");
$conn->send_now("Z$call|bye"); # this will cause 'client' to disconnect
sleep(1);
- $conn->disconnect();
+ $conn->disconnect;
}
# handle incoming messages
my ($conn, $msg, $err) = @_;
my $dxchan = DXChannel->get_by_cnum($conn); # get the dxconnnect object for this message
- if (defined $err && $err) {
+ if (!defined $msg || (defined $err && $err)) {
if ($dxchan) {
+ if (defined $err) {
+ $conn->disconnect;
+ undef $conn;
+ $dxchan->conn(undef);
+ }
$dxchan->disconnect;
+ } elsif ($conn) {
+ $conn->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 ?
+ my ($sort, $call, $line) = DXChannel::decode_input(0, $msg);
+ return unless defined $sort;
+
+ # is there one already connected to me - locally?
my $user = DXUser->get($call);
if (DXChannel->get($call)) {
- my $mess = DXM::msg($lang, $user->sort eq 'A' ? 'concluster' : 'conother', $call);
+ my $mess = DXM::msg($lang, ($user && $user->is_node) ? 'concluster' : 'conother', $call);
already_conn($conn, $call, $mess);
return;
}
- # is there one already connected elsewhere in the cluster (and not a cluster)
+ # is there one already connected elsewhere in the cluster?
if ($user) {
- if (($user->sort eq 'A' || $call eq $myalias) && !DXCluster->get_exact($call)) {
+ if (($user->is_node || $call eq $myalias) && !DXCluster->get_exact($call)) {
;
} else {
- if (DXCluster->get($call) || DXChannel->get($call)) {
- my $mess = DXM::msg($lang, $user->sort eq 'A' ? 'concluster' : 'conother', $call);
+ if (DXCluster->get_exact($call)) {
+ my $mess = DXM::msg($lang, $user->is_node ? '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');
+ $dxchan = DXCommandmode->new($call, $conn, $user) if $user->is_user;
+ $dxchan = DXProt->new($call, $conn, $user) if $user->is_node;
+ $dxchan = BBS->new($call, $conn, $user) if $user->is_bbs;
die "Invalid sort of user on $call = $sort" if !$dxchan;
}
$SIG{'TERM'} = 'IGNORE';
$SIG{'INT'} = 'IGNORE';
+ DXUser::sync;
+
eval {
Local::finish(); # end local processing
};
# disconnect nodes
foreach $dxchan (DXChannel->get_all()) {
- next unless $dxchan->is_ak1a;
- disconnect($dxchan) unless $dxchan == $DXProt::me;
+ next unless $dxchan->is_node;
+ $dxchan->disconnect 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);
- Msg->event_loop(1, 0.05);
# disconnect users
foreach $dxchan (DXChannel->get_all()) {
- next if $dxchan->is_ak1a;
- disconnect($dxchan) unless $dxchan == $DXProt::me;
+ next if $dxchan->is_node;
+ $dxchan->disconnect 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);
DXUser::finish();
+ DXDupe::finish();
# close all databases
DXDb::closeall;
-
+
+ # close all listeners
+ for (@listeners) {
+ $_->close_server;
+ }
+
dbg('chan', "DXSpider version $version ended");
Log('cluster', "DXSpider V$version stopped");
dbgclose();
# the reaper of children
sub reap
{
- $SIG{'CHLD'} = \&reap;
- my $cpid = wait;
- @outstanding_connects = grep {$_->{pid} != $cpid} @outstanding_connects;
+ my $cpid;
+ while (($cpid = waitpid(-1, WNOHANG)) > 0) {
+ dbg('reap', "cpid: $cpid");
+ @outstanding_connects = grep {$_->{pid} != $cpid} @outstanding_connects;
+ $zombies-- if $zombies > 0;
+ }
+ dbg('reap', "cpid: $cpid");
}
# 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)([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;
- }
+ my ($sort, $call, $line) = DXChannel::decode_input($dxchan, $data);
+ return unless defined $sort;
# 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';
die "\$user not defined for $call" if !defined $user;
# normal input
$dxchan->normal($line);
- disconnect($dxchan) if ($dxchan->{state} eq 'bye');
+ $dxchan->disconnect if ($dxchan->{state} eq 'bye');
} elsif ($sort eq 'Z') {
$dxchan->conn(undef);
- disconnect($dxchan);
+ $dxchan->disconnect;
} elsif ($sort eq 'D') {
; # ignored (an echo)
} else {
#############################################################
$starttime = $systime = time;
+$lang = 'en' unless $lang;
# open the debug file, set various FHs to be unbuffered
dbginit();
Log('cluster', "DXSpider V$version started");
# banner
-print "DXSpider DX Cluster Version $version\nCopyright (c) 1998-1999 Dirk Koopman G1TLH\n";
+dbg('err', "DXSpider DX Cluster Version $version", "Copyright (c) 1998-2001 Dirk Koopman G1TLH");
# load Prefixes
-print "loading prefixes ...\n";
+dbg('err', "loading prefixes ...");
Prefix::load();
# load band data
-print "loading band data ...\n";
+dbg('err', "loading band data ...");
Bands::load();
# initialise User file system
-print "loading user file system ...\n";
+dbg('err', "loading user file system ...");
DXUser->init($userfn, 1);
# start listening for incoming messages/connects
-print "starting listener ...\n";
-Msg->new_server("$clusteraddr", $clusterport, \&login);
+use Listeners;
+
+dbg('err', "starting listeners ...");
+push @listeners, IntMsg->new_server("$clusteraddr", $clusterport, \&login);
+dbg('err', "Internal port: $clusteraddr $clusterport");
+for (@main::listen) {
+ push @listeners, ExtMsg->new_server($_->[0], $_->[1], \&login);
+ dbg('err', "External Port: $_->[0] $_->[1]");
+}
+
+# load bad words
+dbg('err', "load badwords: " . (BadWords::load or "Ok"));
# prime some signals
-$SIG{'INT'} = \&cease;
-$SIG{'TERM'} = \&cease;
-$SIG{'HUP'} = 'IGNORE';
-$SIG{'CHLD'} = \&reap;
+unless ($^O =~ /^MS/) {
+ unless ($DB::VERSION) {
+ $SIG{INT} = \&cease;
+ $SIG{TERM} = \&cease;
+ }
+ $SIG{HUP} = 'IGNORE';
+ $SIG{CHLD} = sub { $zombies++ };
+
+ $SIG{PIPE} = sub { dbg('err', "Broken PIPE signal received"); };
+ $SIG{IO} = sub { dbg('err', "SIGIO received"); };
+ $SIG{WINCH} = $SIG{STOP} = $SIG{CONT} = 'IGNORE';
+ $SIG{KILL} = 'DEFAULT'; # as if it matters....
+
+ # catch the rest with a hopeful message
+ for (keys %SIG) {
+ if (!$SIG{$_}) {
+ # dbg('chan', "Catching SIG $_");
+ $SIG{$_} = sub { my $sig = shift; DXDebug::confess("Caught signal $sig"); };
+ }
+ }
+}
+
+# start dupe system
+DXDupe::init();
# read in system messages
DXM->init();
# initialise the Geomagnetic data engine
Geomag->init();
+WCY->init();
# initial the Spot stuff
Spot->init();
# initialise the protocol engine
-print "reading in duplicate spot and WWV info ...\n";
+dbg('err', "reading in duplicate spot and WWV info ...");
DXProt->init();
-
# put in a DXCluster node for us here so we can add users and take them away
-DXNode->new(0, $mycall, 0, 1, $DXProt::myprot_version);
+DXNode->new($DXProt::me, $mycall, 0, 1, $DXProt::myprot_version);
# read in any existing message headers and clean out old crap
-print "reading existing message headers ...\n";
+dbg('err', "reading existing message headers ...");
DXMsg->init();
DXMsg::clean_old();
# read in any cron jobs
-print "reading cron jobs ...\n";
+dbg('err', "reading cron jobs ...");
DXCron->init();
# read in database descriptors
-print "reading database descriptors ...\n";
+dbg('err', "reading database descriptors ...");
DXDb::load();
# starting local stuff
-print "doing local initialisation ...\n";
+dbg('err', "doing local initialisation ...");
eval {
Local::init();
};
dbg('local', "Local::init error $@") if $@;
# print various flags
-#print "useful info - \$^D: $^D \$^W: $^W \$^S: $^S \$^P: $^P\n";
+#dbg('err', "seful info - \$^D: $^D \$^W: $^W \$^S: $^S \$^P: $^P");
# this, such as it is, is the main loop!
-print "orft we jolly well go ...\n";
-dbg('chan', "DXSpider version $version started...");
+dbg('err', "orft we jolly well go ...");
+
+#open(DB::OUT, "|tee /tmp/aa");
+
for (;;) {
- my $timenow;
+# $DB::trace = 1;
+
Msg->event_loop(1, 0.1);
- $timenow = time;
+ my $timenow = time;
process_inqueue(); # read in lines from the input queue and despatch them
+# $DB::trace = 0;
# do timed stuff, ongoing processing happens one a second
if ($timenow != $systime) {
+ reap if $zombies;
$systime = $timenow;
- $cldate = &cldate();
- $ztime = &ztime();
DXCron::process(); # do cron jobs
DXCommandmode::process(); # process ongoing command mode stuff
DXProt::process(); # process ongoing ak1a pcxx stuff
DXConnect::process();
DXMsg::process();
DXDb::process();
+ DXUser::process();
+ DXDupe::process();
+
eval {
Local::process(); # do any localised processing
};
projects / spider.git / blobdiff