decrement the build to account for added modul

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 0b4e7428fcee2c421d12b348962373e7ba506900..a2664b7730f3f64676fcce922d3461b66fddc0e5 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>;
@@ -97,6 +97,11 @@ use Route::User;
 use Editable;
 use Mrtg;
 use USDB;
+use UDPMsg;
+use QSL;
+use Thingy;
+use RouteDB;
+use AMsg;
 
 use Data::Dumper;
 use IO::File;
@@ -124,7 +129,7 @@ $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,0));
-$main::build += 7;                             # add an offset to make it bigger than last system
+$main::build += 1;                             # add an offset to make it bigger than last system
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -190,24 +195,8 @@ sub new_channel
                $user = DXUser->new($call);
        }
        
-
        # create the channel
-       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) {
+       if ($user->is_node) {
                $dxchan = DXProt->new($call, $conn, $user);
        } elsif ($user->is_user) {
                $dxchan = DXCommandmode->new($call, $conn, $user);
@@ -239,6 +228,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;
@@ -275,6 +271,9 @@ sub cease
        # disconnect AGW
        AGWMsg::finish();
 
+       # disconnect UDP customers
+       UDPMsg::finish();
+
        # end everything else
        Msg->event_loop(100, 0.01);
        DXUser::finish();
@@ -324,7 +323,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;
@@ -395,9 +394,9 @@ dbg("DXSpider Version $version, build $build started");
 
 # 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 ...");
@@ -418,17 +417,24 @@ DXUser->init($userfn, 1);
 # 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;
 AGWrestart();
 
+dbg("UDP Listener") if $UDPMsg::enable;
+UDPMsg::init(\&new_channel);
+
 # load bad words
 dbg("load badwords: " . (BadWords::load or "Ok"));
 
@@ -506,6 +512,7 @@ DXDb::load();
 
 # starting local stuff
 dbg("doing local initialisation ...");
+QSL::init(1);
 eval {
        Local::init();
 };
@@ -540,7 +547,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
                };