# 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 Mrtg;
use USDB;
use UDPMsg;
+use QSL;
+use Thingy;
+use RouteDB;
+use AMsg;
use Data::Dumper;
use IO::File;
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 += 6; # add an offset to make it bigger than last system
+$main::build += 2; # 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;
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;
# load Prefixes
dbg("loading prefixes ...");
-my $r = Prefix::load();
-confess $r if $r;
dbg(USDB::init());
+my $r = Prefix::init();
+confess $r if $r;
# load band data
dbg("loading band data ...");
# start listening for incoming messages/connects
dbg("starting listeners ...");
my $conn = IntMsg->new_server($clusteraddr, $clusterport, \&login);
-$conn->conns("Server $clusteraddr/$clusterport");
+$conn->conns("Server $clusteraddr/$clusterport using IntMsg");
push @listeners, $conn;
-dbg("Internal port: $clusteraddr $clusterport");
+dbg("Internal port: $clusteraddr $clusterport using IntMsg");
foreach my $l (@main::listen) {
- $conn = ExtMsg->new_server($l->[0], $l->[1], \&login);
- $conn->conns("Server $l->[0]/$l->[1]");
+ no strict 'refs';
+ my $pkg = $l->[2] || 'ExtMsg';
+ $conn = $pkg->new_server($l->[0], $l->[1], \&login);
+ $conn->conns("Server $l->[0]/$l->[1] using $pkg");
push @listeners, $conn;
- dbg("External Port: $l->[0] $l->[1]");
+ dbg("External Port: $l->[0] $l->[1] using $pkg");
}
dbg("AGW Listener") if $AGWMsg::enable;
# 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
};