unshift @INC, "$root/perl"; # this IS the right way round!
unshift @INC, "$root/local";
+ # do some validation of the input
+ die "The directory $root doesn't exist, please RTFM" unless -d $root;
+ die "$root/local doesn't exist, please RTFM" unless -d "$root/local";
+ die "$root/local/DXVars.pm doesn't exist, please RTFM" unless -e "$root/local/DXVars.pm";
+
+ mkdir "$root/local_cmd", 0777 unless -d "$root/local_cmd";
+
+
# try to create and lock a lockfile (this isn't atomic but
# should do for now
- $lockfn = "$root/perl/cluster.lck"; # lock file name
+ $lockfn = "$root/local/cluster.lck"; # lock file name
if (-e $lockfn) {
open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
my $pid = <CLLOCK>;
use Route::Node;
use Route::User;
use Editable;
+use Mrtg;
+use USDB;
+use UDPMsg;
+use QSL;
use Data::Dumper;
use IO::File;
@inqueue = (); # the main input queue, an array of hashes
$systime = 0; # the time now (in seconds)
-$version = "1.49"; # the version no of the software
+$version = "1.51"; # the version no of the software
$starttime = 0; # the starting time of the cluster
#@outstanding_connects = (); # list of outstanding connects
@listeners = (); # list of listeners
use vars qw($VERSION $BRANCH $build $branch);
$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
-$main::build += 12; # add an offset to make it bigger than last system
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0));
+$main::build += 5; # add an offset to make it bigger than last system
$main::build += $VERSION;
$main::branch += $BRANCH;
# set up the basic channel info
# is there one already connected to me - locally?
- my $user = DXUser->get($call);
+ my $user = DXUser->get_current($call);
my $dxchan = DXChannel->get($call);
if ($dxchan) {
my $mess = DXM::msg($lang, ($user && $user->is_node) ? 'concluster' : 'conother', $call, $main::mycall);
# is he locked out ?
my $basecall = $call;
$basecall =~ s/-\d+$//;
- my $baseuser = DXUser->get($basecall);
+ my $baseuser = DXUser->get_current($basecall);
my $lock = $user->lockout if $user;
if ($baseuser && $baseuser->lockout || $lock) {
if (!$user || !defined $lock || $lock) {
# create the channel
- if ($user->is_spider) {
- $dxchan = QXProt->new($call, $conn, $user);
+ if ($user->wantnp) {
+ if ($user->passphrase && $main::me->user->passphrase) {
+ $dxchan = QXProt->new($call, $conn, $user);
+ } else {
+ unless ($user->passphrase) {
+ Log('DXCommand', "$call using NP but has no passphrase");
+ dbg("$call using NP but has no passphrase");
+ }
+ unless ($main::me->user->passphrase) {
+ Log('DXCommand', "$main::mycall using NP but has no passphrase");
+ dbg("$main::mycall using NP but has no passphrase");
+ }
+ already_conn($conn, $call, "Need to exchange passphrases");
+ return;
+ }
} elsif ($user->is_node) {
$dxchan = DXProt->new($call, $conn, $user);
} elsif ($user->is_user) {
}
}
+# remove any outstanding entries on the inqueue after a disconnection (usually)
+sub clean_inqueue
+{
+ my $dxchan = shift;
+ @inqueue = grep {$_->{dxchan} != $dxchan} @inqueue;
+}
+
sub login
{
return \&new_channel;
# disconnect AGW
AGWMsg::finish();
+ # disconnect UDP customers
+ UDPMsg::finish();
+
# end everything else
Msg->event_loop(100, 0.01);
DXUser::finish();
while (@inqueue) {
my $self = shift @inqueue;
return if !$self;
-
+
my $data = $self->{data};
my $dxchan = $self->{dxchan};
my $error;
return unless defined $sort;
# do the really sexy console interface bit! (Who is going to do the TK interface then?)
- dbg("<- $sort $call $line\n") if $sort ne 'D' && isdbg('chan');
-
+ dbg("<- $sort $call $line") if $sort ne 'D' && isdbg('chan');
+ if ($self->{disconnecting}) {
+ dbg('In disconnection, ignored');
+ next;
+ }
+
# 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);
- $dxchan->disconnect if ($dxchan->{state} eq 'bye');
} elsif ($sort eq 'Z') {
$dxchan->disconnect;
} elsif ($sort eq 'D') {
Log('cluster', "DXSpider V$version, build $build started");
# banner
-dbg("Copyright (c) 1998-2001 Dirk Koopman G1TLH");
+dbg("Copyright (c) 1998-2002 Dirk Koopman G1TLH");
dbg("DXSpider Version $version, build $build started");
# load Prefixes
dbg("loading prefixes ...");
-Prefix::load();
+my $r = Prefix::init();
+confess $r if $r;
+dbg(USDB::init());
# load band data
dbg("loading band data ...");
dbg("loading user file system ...");
DXUser->init($userfn, 1);
+# look for the sysop and the alias user and complain if they aren't there
+{
+ my $ref = DXUser->get($mycall);
+ die "$mycall missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
+ $ref = DXUser->get($myalias);
+ die "$myalias missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
+}
+
# start listening for incoming messages/connects
dbg("starting listeners ...");
my $conn = IntMsg->new_server($clusteraddr, $clusterport, \&login);
push @listeners, $conn;
dbg("External Port: $l->[0] $l->[1]");
}
+
+dbg("AGW Listener") if $AGWMsg::enable;
AGWrestart();
+dbg("UDP Listener") if $UDPMsg::enable;
+UDPMsg::init(\&new_channel);
+
# load bad words
dbg("load badwords: " . (BadWords::load or "Ok"));
}
# start dupe system
+dbg("Starting Dupe system");
DXDupe::init();
# read in system messages
+dbg("Read in Messages");
DXM->init();
# read in command aliases
+dbg("Read in Aliases");
CmdAlias->init();
# initialise the Geomagnetic data engine
+dbg("Start WWV");
Geomag->init();
+dbg("Start WCY");
WCY->init();
# initial the Spot stuff
+dbg("Starting DX Spot system");
Spot->init();
# initialise the protocol engine
-dbg("reading in duplicate spot and WWV info ...");
+dbg("Start Protocol Engines ...");
DXProt->init();
+QXProt->init();
# put in a DXCluster node for us here so we can add users and take them away
$routeroot = Route::Node->new($mycall, $version*100+5300, Route::here($main::me->here)|Route::conf($main::me->conf));
# starting local stuff
dbg("doing local initialisation ...");
+QSL::init(1);
eval {
Local::init();
};
projects / spider.git / blobdiff