projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
4. PC11 with blank callsigns should now be ignored.
[spider.git]
/
perl
/
cluster.pl
diff --git
a/perl/cluster.pl
b/perl/cluster.pl
index 8b45e2bd65d805d7fc411650b387a586199d103f..b96cf370b3162081628d7e355e66fe316215b1b3 100755
(executable)
--- a/
perl/cluster.pl
+++ b/
perl/cluster.pl
@@
-58,19
+58,23
@@
use Bands;
use Geomag;
use CmdAlias;
use Filter;
use Geomag;
use CmdAlias;
use Filter;
-use Local;
use DXDb;
use DXDb;
+use AnnTalk;
+use WCY;
+
+use Data::Dumper;
use Fcntl ':flock';
use Fcntl ':flock';
-use
Carp qw(cluck)
;
+use
Local
;
package main;
@inqueue = (); # the main input queue, an array of hashes
$systime = 0; # the time now (in seconds)
package main;
@inqueue = (); # the main input queue, an array of hashes
$systime = 0; # the time now (in seconds)
-$version = "1.
34
"; # the version no of the software
+$version = "1.
43
"; # the version no of the software
$starttime = 0; # the starting time of the cluster
$lockfn = "cluster.lock"; # lock file name
$starttime = 0; # the starting time of the cluster
$lockfn = "cluster.lock"; # lock file name
+@outstanding_connects = (); # list of outstanding connects
# handle disconnections
sub disconnect
# handle disconnections
sub disconnect
@@
-91,7
+95,7
@@
sub already_conn
dbg('chan', "-> Z $call bye\n");
$conn->send_now("Z$call|bye"); # this will cause 'client' to 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;
+ $conn->disconnect
()
;
}
# handle incoming messages
}
# handle incoming messages
@@
-100,37
+104,47
@@
sub rec
my ($conn, $msg, $err) = @_;
my $dxchan = DXChannel->get_by_cnum($conn); # get the dxconnnect object for this message
my ($conn, $msg, $err) = @_;
my $dxchan = DXChannel->get_by_cnum($conn); # get the dxconnnect object for this message
- if (defined $err && $err) {
- disconnect($dxchan) if defined $dxchan;
+ 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) {
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 $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;
}
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) {
- if (($user->
sort eq 'A'
|| $call eq $myalias) && !DXCluster->get_exact($call)) {
+ if (($user->
is_node
|| $call eq $myalias) && !DXCluster->get_exact($call)) {
;
} else {
;
} else {
- if (DXCluster->get
($call) || DXChannel->ge
t($call)) {
- my $mess = DXM::msg($lang, $user->
sort eq 'A'
? 'concluster' : 'conother', $call);
+ if (DXCluster->get
_exac
t($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 {
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;
my $mess = DXM::msg($lang, 'conother', $call);
already_conn($conn, $call, $mess);
return;
@@
-146,8
+160,9
@@
sub rec
}
# create the channel
}
# 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 = 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;
}
die "Invalid sort of user on $call = $sort" if !$dxchan;
}
@@
-178,12
+193,9
@@
sub cease
};
dbg('local', "Local::finish error $@") if $@;
};
dbg('local', "Local::finish error $@") if $@;
- # close all databases
- DXDb::closeall;
-
- # disconnect users
+ # disconnect nodes
foreach $dxchan (DXChannel->get_all()) {
foreach $dxchan (DXChannel->get_all()) {
- next
if $dxchan->is_ak1a
;
+ next
unless $dxchan->is_node
;
disconnect($dxchan) unless $dxchan == $DXProt::me;
}
Msg->event_loop(1, 0.05);
disconnect($dxchan) unless $dxchan == $DXProt::me;
}
Msg->event_loop(1, 0.05);
@@
-193,9
+205,9
@@
sub cease
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
node
s
+ # disconnect
user
s
foreach $dxchan (DXChannel->get_all()) {
foreach $dxchan (DXChannel->get_all()) {
- next
unless $dxchan->is_ak1a
;
+ next
if $dxchan->is_node
;
disconnect($dxchan) unless $dxchan == $DXProt::me;
}
Msg->event_loop(1, 0.05);
disconnect($dxchan) unless $dxchan == $DXProt::me;
}
Msg->event_loop(1, 0.05);
@@
-204,13
+216,11
@@
sub cease
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);
- 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);
DXUser::finish();
DXUser::finish();
+
+ # close all databases
+ DXDb::closeall;
+
dbg('chan', "DXSpider version $version ended");
Log('cluster', "DXSpider V$version stopped");
dbgclose();
dbg('chan', "DXSpider version $version ended");
Log('cluster', "DXSpider V$version stopped");
dbgclose();
@@
-225,6
+235,7
@@
sub reap
{
$SIG{'CHLD'} = \&reap;
my $cpid = wait;
{
$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
}
# this is where the input queue is dealt with and things are dispatched off to other parts of
@@
-236,17
+247,15
@@
sub process_inqueue
my $data = $self->{data};
my $dxchan = $self->{dxchan};
my $data = $self->{data};
my $dxchan = $self->{dxchan};
- my ($sort, $call, $line) = $data =~ /^(\w)([A-Z0-9\-]+)\|(.*)$/;
my $error;
my $error;
-
- # the above regexp must work
- return unless ($sort && $call && $line);
+ my ($sort, $call, $line) = DXChannel::decode_input($dxchan, $data);
+ return unless defined $sort;
# 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;
}
# 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';
# 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';
@@
-260,6
+269,7
@@
sub process_inqueue
$dxchan->normal($line);
disconnect($dxchan) if ($dxchan->{state} eq 'bye');
} elsif ($sort eq 'Z') {
$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)
disconnect($dxchan);
} elsif ($sort eq 'D') {
; # ignored (an echo)
@@
-296,22
+306,22
@@
STDOUT->autoflush(1);
Log('cluster', "DXSpider V$version started");
# banner
Log('cluster', "DXSpider V$version started");
# banner
-
print "DXSpider DX Cluster Version $version\nCopyright (c) 1998 Dirk Koopman G1TLH\n"
;
+
dbg('err', "DXSpider DX Cluster Version $version", "Copyright (c) 1998-2000 Dirk Koopman G1TLH")
;
# load Prefixes
# load Prefixes
-
print "loading prefixes ...\n"
;
+
dbg('err', "loading prefixes ...")
;
Prefix::load();
# load band data
Prefix::load();
# load band data
-
print "loading band data ...\n"
;
+
dbg('err', "loading band data ...")
;
Bands::load();
# initialise User file system
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
DXUser->init($userfn, 1);
# start listening for incoming messages/connects
-
print "starting listener ...\n"
;
+
dbg('err', "starting listener ...")
;
Msg->new_server("$clusteraddr", $clusterport, \&login);
# prime some signals
Msg->new_server("$clusteraddr", $clusterport, \&login);
# prime some signals
@@
-328,12
+338,13
@@
CmdAlias->init();
# initialise the Geomagnetic data engine
Geomag->init();
# initialise the Geomagnetic data engine
Geomag->init();
+WCY->init();
# initial the Spot stuff
Spot->init();
# initialise the protocol engine
# 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();
DXProt->init();
@@
-341,36
+352,46
@@
DXProt->init();
DXNode->new(0, $mycall, 0, 1, $DXProt::myprot_version);
# read in any existing message headers and clean out old crap
DXNode->new(0, $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
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
DXCron->init();
# read in database descriptors
-
print "reading database descriptors ...\n"
;
+
dbg('err', "reading database descriptors ...")
;
DXDb::load();
# starting local stuff
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
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!
# 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");
+
+$SIG{PIPE} = sub {
+ #$DB::single = 1;
+ dbg('err', "Broken PIPE signal received");
+};
+
for (;;) {
my $timenow;
for (;;) {
my $timenow;
+# $DB::trace = 1;
+
Msg->event_loop(1, 0.1);
$timenow = time;
process_inqueue(); # read in lines from the input queue and despatch them
Msg->event_loop(1, 0.1);
$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) {
# do timed stuff, ongoing processing happens one a second
if ($timenow != $systime) {