reduce offset

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index b33a8b6e0cf81a14832e424182b70a8d2b2453f0..8ce857a7abdc2a3a27b7da48a30a0227cc765d8a 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -33,7 +33,7 @@ BEGIN {
 
        # 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>;
@@ -95,6 +95,12 @@ use Route;
 use Route::Node;
 use Route::User;
 use Editable;
+use Mrtg;
+use USDB;
+use UDPMsg;
+use QSL;
+use Thingy;
+use RouteDB;
 
 use Data::Dumper;
 use IO::File;
@@ -113,7 +119,7 @@ use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects
 
 @inqueue = ();                                 # the main input queue, an array of hashes
 $systime = 0;                                  # the time now (in seconds)
-$version = "1.50";                             # 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
@@ -121,8 +127,8 @@ $reqreg = 0;                                        # 1 = registration required, 2 = deregister people
 
 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 += 3;                             # add an offset to make it bigger than last system
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -160,7 +166,7 @@ sub new_channel
 
        # 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);
@@ -171,7 +177,7 @@ sub new_channel
        # 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) {
@@ -190,8 +196,21 @@ sub new_channel
        
 
        # 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) {
@@ -224,6 +243,13 @@ sub rec
        }
 }
 
+# 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;
@@ -260,6 +286,9 @@ sub cease
        # disconnect AGW
        AGWMsg::finish();
 
+       # disconnect UDP customers
+       UDPMsg::finish();
+
        # end everything else
        Msg->event_loop(100, 0.01);
        DXUser::finish();
@@ -309,7 +338,7 @@ sub process_inqueue
                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;
@@ -380,7 +409,9 @@ 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 ...");
@@ -410,8 +441,13 @@ foreach my $l (@main::listen) {
        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"));
 
@@ -439,24 +475,31 @@ unless ($is_win) {
 }
 
 # 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));
@@ -482,6 +525,7 @@ DXDb::load();
 
 # starting local stuff
 dbg("doing local initialisation ...");
+QSL::init(1);
 eval {
        Local::init();
 };
@@ -516,7 +560,10 @@ for (;;) {
                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
                };