X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=61478887d1b29f7c1cf39f73a74061cd4e6d7227;hb=db3280504f804e18d5c57b9e14b12d7abe38e3a3;hp=572be7a9d6cdae83abe7a0ced707773ff692096d;hpb=6624dcdf07d628e8d6a16fc6549edf40be25b7b2;p=spider.git diff --git a/perl/cluster.pl b/perl/cluster.pl index 572be7a9..61478887 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; @@ -84,6 +86,7 @@ use Timer; use Route; use Route::Node; use Route::User; +use Editable; use Data::Dumper; use IO::File; @@ -97,16 +100,23 @@ 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 $build $is_win $routeroot + $clusterport $mycall $decease $is_win $routeroot $me ); @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 +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 += 12; # add an offset to make it bigger than last system +$main::build += $VERSION; +$main::branch += $BRANCH; + # send a message to call on conn and disconnect sub already_conn @@ -133,7 +143,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); @@ -143,6 +158,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 @@ -150,18 +179,19 @@ sub new_channel $user = DXUser->new($call); } - # is he locked out ? - if ($user->lockout) { - Log('DXCommand', "$call 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'); @@ -209,7 +239,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); @@ -259,35 +289,37 @@ sub reap # the cluster sub process_inqueue { - my $self = shift @inqueue; - return if !$self; + while (@inqueue) { + my $self = shift @inqueue; + return if !$self; - my $data = $self->{data}; - my $dxchan = $self->{dxchan}; - my $error; - my ($sort, $call, $line) = DXChannel::decode_input($dxchan, $data); - return unless defined $sort; + my $data = $self->{data}; + my $dxchan = $self->{dxchan}; + my $error; + my ($sort, $call, $line) = DXChannel::decode_input($dxchan, $data); + 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'); - - # handle A records - my $user = $dxchan->user; - if ($sort eq 'A' || $sort eq 'O') { - $dxchan->start($line, $sort); - } elsif ($sort eq 'I') { - 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') { - ; # ignored (an echo) - } elsif ($sort eq 'G') { - $dxchan->enhanced($line); - } else { - print STDERR atime, " Unknown command letter ($sort) received from $call\n"; + # 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'); + + # handle A records + my $user = $dxchan->user; + if ($sort eq 'A' || $sort eq 'O') { + $dxchan->start($line, $sort); + } elsif ($sort eq 'I') { + 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') { + ; # ignored (an echo) + } elsif ($sort eq 'G') { + $dxchan->enhanced($line); + } else { + print STDERR atime, " Unknown command letter ($sort) received from $call\n"; + } } } @@ -324,29 +356,8 @@ foreach (@debug) { STDOUT->autoflush(1); # calculate build number -$build = $main::version; - -my @fn; -open(CL, "$main::root/perl/cluster.pl") or die "Cannot open cluster.pl $!"; -while () { - next unless /^use\s+([\w:_]+)/; - push @fn, $1; -} -close CL; -my $subbuild; -foreach my $fn (@fn) { - $fn =~ s|::|/|g; - open(CL, "$main::root/perl/${fn}.pm") or next; - while () { - if (/^#\s+\$Id:\s+[\w\._]+,v\s+(\d+\.\d+)\.?(\d+.\d+)?/ ) { - $build += $1; - $subbuild += $2 if $2; - last; - } - } - close CL; -} -$build = "$build.$subbuild" if $subbuild; +$build += $main::version; +$build = "$build.$branch" if $branch; Log('cluster', "DXSpider V$version, build $build started"); @@ -427,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 @@ -455,11 +466,10 @@ eval { }; dbg("Local::init error $@") if $@; -# 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($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();