rbn, ve7cc improvements and fixes

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index d3b24ba9838740fde1d5014a0859f56bcfc69970..ca70610f9d7d824dfa0ae89a5f8c09f01473e623 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -31,6 +31,7 @@ $yes = 'Yes';                                 # visual representation of yes
 $no = 'No';                                            # ditto for no
 $user_interval = 11*60;                        # the interval between unsolicited prompts if no traffic
 
+
 # make sure that modules are searched in the order local then perl
 BEGIN {
        umask 002;
@@ -90,12 +91,11 @@ use DXVars;
 use SysVar;
 
 # order here is important - DXDebug snarfs Carp et al so that Mojo errors go into the debug log
-use DXDebug;
 use Mojolicious 7.26;
 use Mojo::IOLoop;
-
 $DOWARN = 1;
 
+use DXDebug;
 use Msg;
 use IntMsg;
 use Internet;
@@ -192,6 +192,7 @@ our $ending;                                        # signal that we are ending;
 our $broadcast_debug;                  # allow broadcasting of debug info down "enhanced" user connections
 our $clssecs;                                  # the amount of cpu time the DXSpider process have consumed
 our $cldsecs;                                  # the amount of cpu time any child processes have consumed
+our $allowslashcall;                   # Allow / in connecting callsigns (ie PA0/G1TLH, or even PA0/G1TLH/2) 
 
 
 # send a message to call on conn and disconnect
@@ -234,7 +235,7 @@ sub new_channel
                        $user->long($main::mylongitude);
                        $user->qra($main::mylocator);
                }
-               $user->startt($main::systime);
+               $user->startt($main::systime);  
                $conn->conns($call);
                $dxchan = Web->new($call, $conn, $user);
                $dxchan->enhanced(1);
@@ -250,6 +251,7 @@ sub new_channel
 
                # is he locked out ?
                $user = DXUser::get_current($call);
+               $conn->conns($call);
                my $basecall = $call;
                $basecall =~ s/-\d+$//; # remember this for later multiple user processing
                my $lock;
@@ -410,6 +412,7 @@ sub cease
        UDPMsg::finish();
 
        # end everything else
+       RBN::finish();
        DXUser::finish();
        DXDupe::finish();
 
@@ -560,6 +563,9 @@ sub setup_start
        dbg("loading user file system ...");
        DXUser::init(4);                        # version 4 == json format
 
+       Filter::init();                         # doesn't do much, but has to be done
+       
+
        # look for the sysop and the alias user and complain if they aren't there
        {
                die "\$myalias \& \$mycall are the same ($mycall)!, they must be different (hint: make \$mycall = '${mycall}-2';). Oh and don't forget to rerun create_sysop.pl!" if $mycall eq $myalias;
@@ -568,14 +574,14 @@ sub setup_start
                my $oldsort = $ref->sort;
                if ($oldsort ne 'S') {
                        $ref->sort('S');
-                       dbg "Resetting node type from $oldsort -> DXSpider ('S')";
+                       dbg("Resetting node type from $oldsort -> DXSpider ('S')");
                }
                $ref = DXUser::get($myalias);
                die "$myalias missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
                $oldsort = $ref->sort;
                if ($oldsort ne 'U') {
                        $ref->sort('U');
-                       dbg "Resetting sysop user type from $oldsort -> User ('U')";
+                       dbg("Resetting sysop user type from $oldsort -> User ('U')");
                }
        }
 
@@ -681,6 +687,9 @@ sub setup_start
        dbg("reading database descriptors ...");
        DXDb::load();
 
+       dbg("starting RBN ...");
+       RBN::init();
+
        # starting local stuff
        dbg("doing local initialisation ...");
        QSL::init(1);
@@ -753,19 +762,19 @@ sub per_sec
        IsoTime::update($systime);
        DXCommandmode::process(); # process ongoing command mode stuff
        DXProt::process();              # process ongoing ak1a pcxx stuff
-       DXCron::process();      # do cron jobs
        DXXml::process();
        DXConnect::process();
        DXMsg::process();
        DXDb::process();
        DXUser::process();
        DXDupe::process();
-       DXCron::process();                      # do cron jobs
        IsoTime::update($systime);
        DXConnect::process();
        DXUser::process();
        AGWMsg::process();
-       
+       DXCron::process();                      # do cron jobs
+       RBN::process();
+
        Timer::handler();
        DXLog::flushall();
 }
@@ -775,20 +784,19 @@ sub per_10_sec
 
 }
 
-
 sub per_minute
 {
-
+       RBN::per_minute();
 }
 
 sub per_10_minute
 {
-
+       RBN::per_10_minute();
 }
 
 sub per_hour
 {
-
+       RBN::per_hour();
 }
 
 sub per_day