fiddle about with 'bye'

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 4cb4ea6455824f9ddb604194a5cdba625a216484..b7ac117773e9f398f8a777e6d21abd56cd0d4e7e 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -60,6 +60,7 @@ use DXCommandmode;
 use DXProtVars;
 use DXProtout;
 use DXProt;
+use QXProt;
 use DXMsg;
 use DXCron;
 use DXConnect;
@@ -85,6 +86,7 @@ use Timer;
 use Route;
 use Route::Node;
 use Route::User;
+use Editable;
 
 use Data::Dumper;
 use IO::File;
@@ -98,20 +100,21 @@ package main;
 use strict;
 use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects 
                        $zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr 
-                       $clusterport $mycall $decease $is_win $routeroot 
+                       $clusterport $mycall $decease $is_win $routeroot $me $reqreg
                   );
 
 @inqueue = ();                                 # the main input queue, an array of hashes
 $systime = 0;                                  # the time now (in seconds)
-$version = "1.48";                             # the version no of the software
+$version = "1.49";                             # the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 #@outstanding_connects = ();     # list of outstanding connects
 @listeners = ();                               # list of listeners
+$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 += 14;                            # add an offset to make it bigger than last system
+$main::build += 12;                            # add an offset to make it bigger than last system
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -156,6 +159,20 @@ sub new_channel
                already_conn($conn, $call, $mess);
                return;
        }
+
+       # is he locked out ?
+       my $basecall = $call;
+       $basecall =~ s/-\d+$//;
+       my $baseuser = DXUser->get($basecall);
+       my $lock = $user->lockout if $user;
+       if ($baseuser && $baseuser->lockout || $lock) {
+               if (!$user || !defined $lock || $lock) {
+                       my $host = $conn->{peerhost} || "unknown";
+                       Log('DXCommand', "$call on $host is locked out, disconnected");
+                       $conn->disconnect;
+                       return;
+               }
+       }
        
        if ($user) {
                $user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
@@ -163,19 +180,19 @@ sub new_channel
                $user = DXUser->new($call);
        }
        
-       # is he locked out ?
-       if ($user->lockout) {
-               my $host = $conn->{peerhost} || "unknown";
-               Log('DXCommand', "$call on $host is locked out, disconnected");
-               $conn->disconnect;
-               return;
-       }
 
        # create the channel
-       $dxchan = DXCommandmode->new($call, $conn, $user) if $user->is_user;
-       $dxchan = DXProt->new($call, $conn, $user) if $user->is_node;
-       $dxchan = BBS->new($call, $conn, $user) if $user->is_bbs;
-       die "Invalid sort of user on $call = $sort" if !$dxchan;
+       if ($user->is_spider) {
+               $dxchan = QXProt->new($call, $conn, $user);
+       } elsif ($user->is_node) {
+               $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);
+       } else {
+               die "Invalid sort of user on $call = $sort";
+       }
 
        # check that the conn has a callsign
        $conn->conns($call) if $conn->isa('IntMsg');
@@ -223,7 +240,7 @@ sub cease
 
        # disconnect nodes
        foreach $dxchan (DXChannel->get_all_nodes) {
-           $dxchan->disconnect(2) unless $dxchan == $DXProt::me;
+           $dxchan->disconnect(2) unless $dxchan == $main::me;
        }
        Msg->event_loop(100, 0.01);
 
@@ -294,7 +311,6 @@ sub process_inqueue
                        die "\$user not defined for $call" if !defined $user;
                        # normal input
                        $dxchan->normal($line);
-                       $dxchan->disconnect if ($dxchan->{state} eq 'bye');
                } elsif ($sort eq 'Z') {
                        $dxchan->disconnect;
                } elsif ($sort eq 'D') {
@@ -422,12 +438,12 @@ dbg("reading in duplicate spot and WWV info ...");
 DXProt->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($DXProt::me->here)|Route::conf($DXProt::me->conf));
+$routeroot = Route::Node->new($mycall, $version*100+5300, Route::here($main::me->here)|Route::conf($main::me->conf));
 
 # make sure that there is a routing OUTPUT node default file
 #unless (Filter::read_in('route', 'node_default', 0)) {
-#      my $dxcc = $DXProt::me->dxcc;
-#      $Route::filterdef->cmd($DXProt::me, 'route', 'accept', "node_default call $mycall" );
+#      my $dxcc = $main::me->dxcc;
+#      $Route::filterdef->cmd($main::me, 'route', 'accept', "node_default call $mycall" );
 #}
 
 # read in any existing message headers and clean out old crap
@@ -450,16 +466,10 @@ eval {
 };
 dbg("Local::init error $@") if $@;
 
-dbg("cleaning out old debug files");
-DXDebug::dbgclean();
-
-# print various flags
-#dbg("seful info - \$^D: $^D \$^W: $^W \$^S: $^S \$^P: $^P");
-
 # this, such as it is, is the main loop!
 dbg("orft we jolly well go ...");
 my $script = new Script "startup";
-$script->run($DXProt::me) if $script;
+$script->run($main::me) if $script;
 
 #open(DB::OUT, "|tee /tmp/aa");
 
@@ -478,6 +488,7 @@ for (;;) {
                DXCron::process();      # do cron jobs
                DXCommandmode::process(); # process ongoing command mode stuff
                DXProt::process();              # process ongoing ak1a pcxx stuff
+               QXProt::process();
                DXConnect::process();
                DXMsg::process();
                DXDb::process();