Change DXUser->get* to DXUser::get*

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 9178a7277c54893055a4c3f95c87096994c1081c..6791896682c75922543246e1a79761300bdd76bb 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -102,6 +102,7 @@ use RouteDB;
 use DXXml;
 use DXSql;
 use IsoTime;
+use BPQMsg;
 
 use Data::Dumper;
 use IO::File;
@@ -164,7 +165,7 @@ sub new_channel
 
        # set up the basic channel info
        # is there one already connected to me - locally?
-       my $user = DXUser->get_current($call);
+       my $user = DXUser::get_current($call);
        my $dxchan = DXChannel::get($call);
        if ($dxchan) {
                if ($user && $user->is_node) {
@@ -185,7 +186,7 @@ sub new_channel
        # is he locked out ?
        my $basecall = $call;
        $basecall =~ s/-\d+$//;
-       my $baseuser = DXUser->get_current($basecall);
+       my $baseuser = DXUser::get_current($basecall);
        my $lock = $user->lockout if $user;
        if ($baseuser && $baseuser->lockout || $lock) {
                if (!$user || !defined $lock || $lock) {
@@ -207,8 +208,8 @@ sub new_channel
                $dxchan = DXProt->new($call, $conn, $user);
        } elsif ($user->is_user) {
                $dxchan = DXCommandmode->new($call, $conn, $user);
-       } elsif ($user->is_bbs) {
-               $dxchan = BBS->new($call, $conn, $user);
+#      } elsif ($user->is_bbs) {                                  # there is no support so
+#              $dxchan = BBS->new($call, $conn, $user);               # don't allow it!!!
        } else {
                die "Invalid sort of user on $call = $sort";
        }
@@ -240,10 +241,12 @@ sub cease
 
        DXUser::sync;
 
-       eval {
-               Local::finish();   # end local processing
-       };
-       dbg("Local::finish error $@") if $@;
+       if (defined &Local::finish) {
+               eval {
+                       Local::finish();   # end local processing
+               };
+               dbg("Local::finish error $@") if $@;
+       }
 
        # disconnect nodes
        foreach $dxchan (DXChannel::get_all_nodes) {
@@ -258,6 +261,7 @@ sub cease
 
        # disconnect AGW
        AGWMsg::finish();
+       BPQMsg::finish();
 
        # disconnect UDP customers
        UDPMsg::finish();
@@ -383,9 +387,9 @@ DXUser->init($userfn, 1);
 
 # look for the sysop and the alias user and complain if they aren't there
 {
-       my $ref = DXUser->get($mycall);
+       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);
+       $ref = DXUser::get($myalias);
        die "$myalias missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
 }
 
@@ -409,6 +413,9 @@ foreach my $l (@main::listen) {
 dbg("AGW Listener") if $AGWMsg::enable;
 AGWrestart();
 
+dbg("BPQ Listener") if $BPQMsg::enable;
+BPQMsg::init(\&new_channel);
+
 dbg("UDP Listener") if $UDPMsg::enable;
 UDPMsg::init(\&new_channel);
 
@@ -484,17 +491,20 @@ DXMsg::clean_old();
 dbg("reading cron jobs ...");
 DXCron->init();
 
-# read in database descriptors
+# read in database desriptors
 dbg("reading database descriptors ...");
 DXDb::load();
 
 # starting local stuff
 dbg("doing local initialisation ...");
 QSL::init(1);
-eval {
-       Local::init();
-};
-dbg("Local::init error $@") if $@;
+if (defined &Local::init) {
+       eval {
+               Local::init();
+       };
+       dbg("Local::init error $@") if $@;
+}
+
 
 # this, such as it is, is the main loop!
 dbg("orft we jolly well go ...");
@@ -533,11 +543,14 @@ for (;;) {
                DXUser::process();
                DXDupe::process();
                AGWMsg::process();
+               BPQMsg::process();
 
-               eval {
-                       Local::process();       # do any localised processing
-               };
-               dbg("Local::process error $@") if $@;
+               if (defined &Local::process) {
+                       eval {
+                               Local::process();       # do any localised processing
+                       };
+                       dbg("Local::process error $@") if $@;
+               }
        }
        if ($decease) {
                last if --$decease <= 0;