# 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 Editable;
use Mrtg;
use USDB;
+use UDPMsg;
+use QSL;
+use Thingy;
use Data::Dumper;
use IO::File;
@inqueue = (); # the main input queue, an array of hashes
$systime = 0; # the time now (in seconds)
-$version = "1.51"; # the version no of the software
+$version = "2.00"; # 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,0));
-$main::build += 7; # add an offset to make it bigger than last system
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/,(0,0));
+$main::build += 4; # add an offset to make it bigger than last system
$main::build += $VERSION;
$main::branch += $BRANCH;
}
}
+# 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();
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;
STDOUT->autoflush(1);
# calculate build number
-$build += $main::version;
$build = "$build.$branch" if $branch;
Log('cluster', "DXSpider V$version, build $build started");
# banner
-dbg("Copyright (c) 1998-2002 Dirk Koopman G1TLH");
+my ($year) = (gmtime($main::systime))[5];
+$year += 1900;
+dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
dbg("DXSpider Version $version, build $build started");
# load Prefixes
dbg("loading prefixes ...");
-Prefix::load();
dbg(USDB::init());
+my $r = Prefix::init();
+confess $r if $r;
# load band data
dbg("loading band data ...");
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"));
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));
+$routeroot = Route::Node->new($mycall, $version*100+5251, Route::here($main::me->here)|Route::conf($main::me->conf));
# make sure that there is a routing OUTPUT node default file
#unless (Filter::read_in('route', 'node_default', 0)) {
# starting local stuff
dbg("doing local initialisation ...");
+QSL::init(1);
eval {
Local::init();
};
DXUser::process();
DXDupe::process();
AGWMsg::process();
-
+
+ # this where things really start to happen (in DXSpider 2)
+ Thingy::process();
+
eval {
Local::process(); # do any localised processing
};