X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=169900cc1afc5f674299d373244dafed42eba6f2;hb=ace0278fbe041182bec5fc536ade55647145994b;hp=516e7cb1eb8f57ae33478d313e97ee9627df3245;hpb=765add8acca099e69f2b2cde2bb58a48a00852d3;p=spider.git diff --git a/perl/cluster.pl b/perl/cluster.pl index 516e7cb1..169900cc 100755 --- 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; @@ -67,6 +68,7 @@ use DXBearing; use DXDb; use DXHash; use DXDupe; +use Script; use Prefix; use Spot; use Bands; @@ -97,7 +99,7 @@ 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 ); @inqueue = (); # the main input queue, an array of hashes @@ -110,7 +112,7 @@ $starttime = 0; # the starting time of the cluster 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 += 15; # add an offset to make it bigger than last system +$main::build += 13; # add an offset to make it bigger than last system $main::build += $VERSION; $main::branch += $BRANCH; @@ -140,7 +142,12 @@ sub new_channel my ($conn, $msg) = @_; my ($sort, $call, $line) = DXChannel::decode_input(0, $msg); return unless defined $sort; - + + unless (is_callsign($call)) { + already_conn($conn, $call, DXM::msg($lang, "illcall", $call)); + return; + } + # set up the basic channel info # is there one already connected to me - locally? my $user = DXUser->get($call); @@ -150,6 +157,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 @@ -157,19 +178,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'); @@ -217,7 +238,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); @@ -416,12 +437,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 @@ -452,6 +473,8 @@ DXDebug::dbgclean(); # this, such as it is, is the main loop! dbg("orft we jolly well go ..."); +my $script = new Script "startup"; +$script->run($main::me) if $script; #open(DB::OUT, "|tee /tmp/aa"); @@ -470,6 +493,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();