X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=b7ac117773e9f398f8a777e6d21abd56cd0d4e7e;hb=b735ad9a0325fae9ca0c2324794b99288a737802;hp=fb48c1e005b64b133f35169371347945b4361c26;hpb=2a9a56c26e1ed0622dc9cd7fc48b0498b059e274;p=spider.git diff --git a/perl/cluster.pl b/perl/cluster.pl index fb48c1e0..b7ac1177 100755 --- a/perl/cluster.pl +++ b/perl/cluster.pl @@ -25,7 +25,7 @@ BEGIN { # try to create and lock a lockfile (this isn't atomic but # should do for now - my $lockfn = "$root/perl/cluster.lock"; # lock file name + $lockfn = "$root/perl/cluster.lck"; # lock file name if (-e $lockfn) { open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!"; my $pid = ; @@ -36,12 +36,19 @@ BEGIN { open(CLLOCK, ">$lockfn") or die "Can't open Lockfile ($lockfn) $!"; print CLLOCK "$$\n"; close CLLOCK; + + $is_win = ($^O =~ /^MS/ || $^O =~ /^OS-2/) ? 1 : 0; # is it Windows? + $systime = time; } +use DXVars; use Msg; use IntMsg; +use Internet; +use Listeners; use ExtMsg; -use DXVars; +use AGWConnect; +use AGWMsg; use DXDebug; use DXLog; use DXLogPrint; @@ -50,23 +57,39 @@ use DXChannel; use DXUser; use DXM; use DXCommandmode; +use DXProtVars; +use DXProtout; use DXProt; +use QXProt; use DXMsg; -use DXCluster; use DXCron; use DXConnect; +use DXBearing; +use DXDb; +use DXHash; +use DXDupe; +use Script; use Prefix; +use Spot; use Bands; +use Keps; +use Minimuf; +use Sun; use Geomag; use CmdAlias; use Filter; -use DXDb; use AnnTalk; +use BBS; use WCY; -use DXDupe; use BadWords; +use Timer; +use Route; +use Route::Node; +use Route::User; +use Editable; use Data::Dumper; +use IO::File; use Fcntl ':flock'; use POSIX ":sys_wait_h"; @@ -75,24 +98,34 @@ use Local; 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 ); +use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects + $zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr + $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.47"; # the version no of the software +$version = "1.49"; # the version no of the software $starttime = 0; # the starting time of the cluster -$lockfn = "cluster.lock"; # lock file name #@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 += 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 { my ($conn, $call, $mess) = @_; - - dbg('chan', "-> D $call $mess\n"); + + $conn->disable_read(1); + dbg("-> D $call $mess\n") if isdbg('chan'); $conn->send_now("D$call|$mess"); sleep(2); $conn->disconnect; @@ -102,7 +135,7 @@ sub error_handler { my $dxchan = shift; $dxchan->{conn}->set_error(undef) if exists $dxchan->{conn}; - $dxchan->disconnect; + $dxchan->disconnect(1); } # handle incoming messages @@ -111,7 +144,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); @@ -121,40 +159,40 @@ 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; + } + } - # is there one already connected elsewhere in the cluster? if ($user) { - if (($user->is_node || $call eq $myalias) && !DXCluster->get_exact($call)) { - ; - } else { - if (my $ref = DXCluster->get_exact($call)) { - my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->call); - already_conn($conn, $call, $mess); - return; - } - } $user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems } else { - if (my $ref = DXCluster->get_exact($call)) { - my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->call); - already_conn($conn, $call, $mess); - return; - } $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'); @@ -188,35 +226,34 @@ sub cease { my $dxchan; - $SIG{'TERM'} = 'IGNORE'; - $SIG{'INT'} = 'IGNORE'; + unless ($is_win) { + $SIG{'TERM'} = 'IGNORE'; + $SIG{'INT'} = 'IGNORE'; + } DXUser::sync; eval { Local::finish(); # end local processing }; - dbg('local', "Local::finish error $@") if $@; + dbg("Local::finish error $@") if $@; # disconnect nodes - foreach $dxchan (DXChannel->get_all()) { - next unless $dxchan->is_node; - $dxchan->disconnect unless $dxchan == $DXProt::me; + foreach $dxchan (DXChannel->get_all_nodes) { + $dxchan->disconnect(2) unless $dxchan == $main::me; } - Msg->event_loop(1, 0.05); - Msg->event_loop(1, 0.05); + Msg->event_loop(100, 0.01); # disconnect users - foreach $dxchan (DXChannel->get_all()) { - next if $dxchan->is_node; - $dxchan->disconnect unless $dxchan == $DXProt::me; + foreach $dxchan (DXChannel->get_all_users) { + $dxchan->disconnect; } - Msg->event_loop(1, 0.05); - Msg->event_loop(1, 0.05); - Msg->event_loop(1, 0.05); - Msg->event_loop(1, 0.05); - Msg->event_loop(1, 0.05); - Msg->event_loop(1, 0.05); + + # disconnect AGW + AGWMsg::finish(); + + # end everything else + Msg->event_loop(100, 0.01); DXUser::finish(); DXDupe::finish(); @@ -224,12 +261,12 @@ sub cease DXDb::closeall; # close all listeners - for (@listeners) { - $_->close_server; + foreach my $l (@listeners) { + $l->close_server; } - dbg('chan', "DXSpider version $version ended"); - Log('cluster', "DXSpider V$version stopped"); + dbg("DXSpider version $version, build $build ended") if isdbg('chan'); + Log('cluster', "DXSpider V$version, build $build ended"); dbgclose(); Logclose(); unlink $lockfn; @@ -242,44 +279,47 @@ sub reap { my $cpid; while (($cpid = waitpid(-1, WNOHANG)) > 0) { - dbg('reap', "cpid: $cpid"); + dbg("cpid: $cpid") if isdbg('reap'); # Msg->pid_gone($cpid); $zombies-- if $zombies > 0; } - dbg('reap', "cpid: $cpid"); + dbg("cpid: $cpid") if isdbg('reap'); } # this is where the input queue is dealt with and things are dispatched off to other parts of # 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('chan', "<- $sort $call $line\n") unless $sort eq 'D'; - - # 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) - } 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); + } 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"; + } } } @@ -293,6 +333,12 @@ sub uptime my $mins = int $t / 60; return sprintf "%d %02d:%02d", $days, $hours, $mins; } + +sub AGWrestart +{ + AGWMsg::init(\&new_channel); +} + ############################################################# # # The start of the main line of code @@ -303,65 +349,69 @@ $starttime = $systime = time; $lang = 'en' unless $lang; # open the debug file, set various FHs to be unbuffered -dbginit(); +dbginit(\&DXCommandmode::broadcast_debug); foreach (@debug) { dbgadd($_); } STDOUT->autoflush(1); -Log('cluster', "DXSpider V$version started"); +# calculate build number +$build += $main::version; +$build = "$build.$branch" if $branch; + +Log('cluster', "DXSpider V$version, build $build started"); # banner -dbg('err', "DXSpider DX Cluster Version $version", "Copyright (c) 1998-2001 Dirk Koopman G1TLH"); +dbg("Copyright (c) 1998-2001 Dirk Koopman G1TLH"); +dbg("DXSpider Version $version, build $build started"); # load Prefixes -dbg('err', "loading prefixes ..."); +dbg("loading prefixes ..."); Prefix::load(); # load band data -dbg('err', "loading band data ..."); +dbg("loading band data ..."); Bands::load(); # initialise User file system -dbg('err', "loading user file system ..."); +dbg("loading user file system ..."); DXUser->init($userfn, 1); # start listening for incoming messages/connects -use Listeners; - -dbg('err', "starting listeners ..."); +dbg("starting listeners ..."); my $conn = IntMsg->new_server($clusteraddr, $clusterport, \&login); $conn->conns("Server $clusteraddr/$clusterport"); push @listeners, $conn; -dbg('err', "Internal port: $clusteraddr $clusterport"); -for (@main::listen) { - $conn = ExtMsg->new_server($_->[0], $_->[1], \&login); - $conn->conns("Server $_->[0]/$_->[1]"); +dbg("Internal port: $clusteraddr $clusterport"); +foreach my $l (@main::listen) { + $conn = ExtMsg->new_server($l->[0], $l->[1], \&login); + $conn->conns("Server $l->[0]/$l->[1]"); push @listeners, $conn; - dbg('err', "External Port: $_->[0] $_->[1]"); + dbg("External Port: $l->[0] $l->[1]"); } +AGWrestart(); # load bad words -dbg('err', "load badwords: " . (BadWords::load or "Ok")); +dbg("load badwords: " . (BadWords::load or "Ok")); # prime some signals -unless ($^O =~ /^MS/) { - unless ($DB::VERSION) { - $SIG{INT} = \&cease; - $SIG{TERM} = \&cease; - } +unless ($DB::VERSION) { + $SIG{INT} = $SIG{TERM} = sub { $decease = 1 }; +} + +unless ($is_win) { $SIG{HUP} = 'IGNORE'; $SIG{CHLD} = sub { $zombies++ }; - $SIG{PIPE} = sub { dbg('err', "Broken PIPE signal received"); }; - $SIG{IO} = sub { dbg('err', "SIGIO received"); }; + $SIG{PIPE} = sub { dbg("Broken PIPE signal received"); }; + $SIG{IO} = sub { dbg("SIGIO received"); }; $SIG{WINCH} = $SIG{STOP} = $SIG{CONT} = 'IGNORE'; $SIG{KILL} = 'DEFAULT'; # as if it matters.... # catch the rest with a hopeful message for (keys %SIG) { if (!$SIG{$_}) { - # dbg('chan', "Catching SIG $_"); + # dbg("Catching SIG $_") if isdbg('chan'); $SIG{$_} = sub { my $sig = shift; DXDebug::confess("Caught signal $sig"); }; } } @@ -384,44 +434,49 @@ WCY->init(); Spot->init(); # initialise the protocol engine -dbg('err', "reading in duplicate spot and WWV info ..."); +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 -DXNode->new($DXProt::me, $mycall, 0, 1, $DXProt::myprot_version); +$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 = $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 -dbg('err', "reading existing message headers ..."); +dbg("reading existing message headers ..."); DXMsg->init(); DXMsg::clean_old(); # read in any cron jobs -dbg('err', "reading cron jobs ..."); +dbg("reading cron jobs ..."); DXCron->init(); # read in database descriptors -dbg('err', "reading database descriptors ..."); +dbg("reading database descriptors ..."); DXDb::load(); # starting local stuff -dbg('err', "doing local initialisation ..."); +dbg("doing local initialisation ..."); eval { Local::init(); }; -dbg('local', "Local::init error $@") if $@; - -# print various flags -#dbg('err', "seful info - \$^D: $^D \$^W: $^W \$^S: $^S \$^P: $^P"); +dbg("Local::init error $@") if $@; # this, such as it is, is the main loop! -dbg('err', "orft we jolly well go ..."); +dbg("orft we jolly well go ..."); +my $script = new Script "startup"; +$script->run($main::me) if $script; #open(DB::OUT, "|tee /tmp/aa"); for (;;) { # $DB::trace = 1; - Msg->event_loop(25, 0.001); + Msg->event_loop(10, 0.010); my $timenow = time; process_inqueue(); # read in lines from the input queue and despatch them # $DB::trace = 0; @@ -433,16 +488,18 @@ 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(); DXUser::process(); DXDupe::process(); - + AGWMsg::process(); + eval { Local::process(); # do any localised processing }; - dbg('local', "Local::process error $@") if $@; + dbg("Local::process error $@") if $@; } if ($decease) { last if --$decease <= 0;