X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=6791896682c75922543246e1a79761300bdd76bb;hb=ab811a0c902225075a9bd69749f65594079433a9;hp=80c4a0573cb62899fa408826b0f46e7563677af1;hpb=ee822fc8bbe6985f708cca37ce3953b83651e542;p=spider.git diff --git a/perl/cluster.pl b/perl/cluster.pl index 80c4a057..67918966 100755 --- a/perl/cluster.pl +++ b/perl/cluster.pl @@ -7,19 +7,19 @@ # # Copyright (c) 1998 Dirk Koopman G1TLH # -# $Id$ -# +# +# require 5.004; # make sure that modules are searched in the order local then perl BEGIN { umask 002; - + # root of directory tree for this system - $root = "/spider"; + $root = "/spider"; $root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'}; - + unshift @INC, "$root/perl"; # this IS the right way round! unshift @INC, "$root/local"; @@ -27,11 +27,11 @@ BEGIN { die "The directory $root doesn't exist, please RTFM" unless -d $root; die "$root/local doesn't exist, please RTFM" unless -d "$root/local"; die "$root/local/DXVars.pm doesn't exist, please RTFM" unless -e "$root/local/DXVars.pm"; - + mkdir "$root/local_cmd", 0777 unless -d "$root/local_cmd"; - - # try to create and lock a lockfile (this isn't atomic but + + # try to create and lock a lockfile (this isn't atomic but # should do for now $lockfn = "$root/local/cluster.lck"; # lock file name if (-e $lockfn) { @@ -68,7 +68,6 @@ use DXCommandmode; use DXProtVars; use DXProtout; use DXProt; -use Aranea; use DXMsg; use DXCron; use DXConnect; @@ -99,53 +98,47 @@ use Mrtg; use USDB; use UDPMsg; use QSL; -use Thingy; use RouteDB; -use AMsg; +use DXXml; +use DXSql; +use IsoTime; +use BPQMsg; use Data::Dumper; use IO::File; -use Fcntl ':flock'; +use Fcntl ':flock'; use POSIX ":sys_wait_h"; +use Version; use Local; package main; use strict; -use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects - $zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr +use vars qw(@inqueue $systime $starttime $lockfn @outstanding_connects + $zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr $clusterport $mycall $decease $is_win $routeroot $me $reqreg $bumpexisting - $allowdxby $dbh $dsn $dbuser $dbpass + $allowdxby $dbh $dsn $dbuser $dbpass $do_xml $systime_days $systime_daystart + $can_encode ); @inqueue = (); # the main input queue, an array of hashes $systime = 0; # the time now (in seconds) -$version = "1.52"; # the version no of the software -$starttime = 0; # the starting time of the cluster -#@outstanding_connects = (); # list of outstanding connects +$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 $bumpexisting = 1; # 1 = allow new connection to disconnect old, 0 - don't allow it $allowdxby = 0; # 1 = allow "dx by ", 0 - don't allow it -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,0)); -$main::build += $VERSION; -$main::branch += $BRANCH; -$main::build += 1; # fudge (put back for now) - - - # send a message to call on conn and disconnect sub already_conn { my ($conn, $call, $mess) = @_; $conn->disable_read(1); - dbg("-> D $call $mess\n") if isdbg('chan'); + dbg("-> D $call $mess\n") if isdbg('chan'); $conn->send_now("D$call|$mess"); sleep(2); $conn->disconnect; @@ -171,8 +164,8 @@ sub new_channel } # set up the basic channel info - # is there one already connected to me - locally? - my $user = DXUser->get_current($call); + # is there one already connected to me - locally? + my $user = DXUser::get_current($call); my $dxchan = DXChannel::get($call); if ($dxchan) { if ($user && $user->is_node) { @@ -193,7 +186,7 @@ sub new_channel # is he locked out ? my $basecall = $call; $basecall =~ s/-\d+$//; - my $baseuser = DXUser->get_current($basecall); + my $baseuser = DXUser::get_current($basecall); my $lock = $user->lockout if $user; if ($baseuser && $baseuser->lockout || $lock) { if (!$user || !defined $lock || $lock) { @@ -203,20 +196,20 @@ sub new_channel return; } } - + if ($user) { $user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems } else { $user = DXUser->new($call); } - + # create the channel if ($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); +# } elsif ($user->is_bbs) { # there is no support so +# $dxchan = BBS->new($call, $conn, $user); # don't allow it!!! } else { die "Invalid sort of user on $call = $sort"; } @@ -245,13 +238,15 @@ sub cease $SIG{'TERM'} = 'IGNORE'; $SIG{'INT'} = 'IGNORE'; } - + DXUser::sync; - eval { - Local::finish(); # end local processing - }; - dbg("Local::finish error $@") if $@; + if (defined &Local::finish) { + eval { + Local::finish(); # end local processing + }; + dbg("Local::finish error $@") if $@; + } # disconnect nodes foreach $dxchan (DXChannel::get_all_nodes) { @@ -266,6 +261,7 @@ sub cease # disconnect AGW AGWMsg::finish(); + BPQMsg::finish(); # disconnect UDP customers UDPMsg::finish(); @@ -283,12 +279,12 @@ sub cease $l->close_server; } - LogDbg('cluster', "DXSpider V$version, build $build ended"); + LogDbg('cluster', "DXSpider V$version, build $subversion.$build ended"); dbgclose(); Logclose(); $dbh->finish if $dbh; - + unlink $lockfn; # $SIG{__WARN__} = $SIG{__DIE__} = sub {my $a = shift; cluck($a); }; exit(0); @@ -327,11 +323,13 @@ sub AGWrestart ############################################################# # -# The start of the main line of code +# The start of the main line of code # ############################################################# $starttime = $systime = time; +$systime_days = int ($systime / 86400); +$systime_daystart = $systime_days * 86400; $lang = 'en' unless $lang; unless ($DB::VERSION) { @@ -345,28 +343,34 @@ foreach (@debug) { } STDOUT->autoflush(1); -# calculate build number -$build += $main::version; -$build = "$build.$branch" if $branch; +# try to load the database +if (DXSql::init($dsn)) { + $dbh = DXSql->new($dsn); + $dbh = $dbh->connect($dsn, $dbuser, $dbpass) if $dbh; +} -LogDbg('cluster', "DXSpider V$version, build $build started"); +# try to load Encode +{ + local $^W = 0; + my $w = $SIG{__DIE__}; + $SIG{__DIE__} = 'IGNORE'; + eval { require Encode; }; + unless ($@) { + import Encode; + $can_encode = 1; + } + $SIG{__DIE__} = $w; +} + +# try to load XML::Simple +DXXml::init(); # banner my ($year) = (gmtime)[5]; $year += 1900; +LogDbg('cluster', "DXSpider V$version, build $subversion.$build started"); dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH"); -# try to load the database -if ($dsn && -e "$root/perl/DXSql.pm") { - require DXSql; - import DXSql; - - if (DXSql::init()) { - $dbh = DXSql->new($dsn); - $dbh = $dbh->connect($dsn, $dbuser, $dbpass) if $dbh; - } -} - # load Prefixes dbg("loading prefixes ..."); dbg(USDB::init()); @@ -378,14 +382,14 @@ dbg("loading band data ..."); Bands::load(); # initialise User file system -dbg("loading user file system ..."); +dbg("loading user file system ..."); DXUser->init($userfn, 1); # look for the sysop and the alias user and complain if they aren't there { - my $ref = DXUser->get($mycall); + my $ref = DXUser::get($mycall); die "$mycall missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9; - $ref = DXUser->get($myalias); + $ref = DXUser::get($myalias); die "$myalias missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9; } @@ -398,8 +402,8 @@ dbg("Internal port: $clusteraddr $clusterport using IntMsg"); foreach my $l (@main::listen) { no strict 'refs'; my $pkg = $l->[2] || 'ExtMsg'; - my $login = $l->[3] || 'login'; - + my $login = $l->[3] || 'login'; + $conn = $pkg->new_server($l->[0], $l->[1], \&{"${pkg}::${login}"}); $conn->conns("Server $l->[0]/$l->[1] using ${pkg}::${login}"); push @listeners, $conn; @@ -409,6 +413,9 @@ foreach my $l (@main::listen) { dbg("AGW Listener") if $AGWMsg::enable; AGWrestart(); +dbg("BPQ Listener") if $BPQMsg::enable; +BPQMsg::init(\&new_channel); + dbg("UDP Listener") if $UDPMsg::enable; UDPMsg::init(\&new_channel); @@ -423,7 +430,7 @@ unless ($DB::VERSION) { unless ($is_win) { $SIG{HUP} = 'IGNORE'; $SIG{CHLD} = sub { $zombies++ }; - + $SIG{PIPE} = sub { dbg("Broken PIPE signal received"); }; $SIG{IO} = sub { dbg("SIGIO received"); }; $SIG{WINCH} = $SIG{STOP} = $SIG{CONT} = 'IGNORE'; @@ -433,7 +440,7 @@ unless ($is_win) { for (keys %SIG) { if (!$SIG{$_}) { # dbg("Catching SIG $_") if isdbg('chan'); - $SIG{$_} = sub { my $sig = shift; DXDebug::confess("Caught signal $sig"); }; + $SIG{$_} = sub { my $sig = shift; DXDebug::confess("Caught signal $sig"); }; } } } @@ -463,10 +470,11 @@ Spot->init(); # initialise the protocol engine dbg("Start Protocol Engines ..."); DXProt->init(); -Aranea->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($main::me->here)|Route::conf($main::me->conf)); +$routeroot->do_pc9x(1); +$routeroot->via_pc92(1); # make sure that there is a routing OUTPUT node default file #unless (Filter::read_in('route', 'node_default', 0)) { @@ -483,17 +491,20 @@ DXMsg::clean_old(); dbg("reading cron jobs ..."); DXCron->init(); -# read in database descriptors +# read in database desriptors dbg("reading database descriptors ..."); DXDb::load(); # starting local stuff dbg("doing local initialisation ..."); QSL::init(1); -eval { - Local::init(); -}; -dbg("Local::init error $@") if $@; +if (defined &Local::init) { + eval { + Local::init(); + }; + dbg("Local::init error $@") if $@; +} + # this, such as it is, is the main loop! dbg("orft we jolly well go ..."); @@ -504,33 +515,42 @@ $script->run($main::me) if $script; for (;;) { # $DB::trace = 1; - + Msg->event_loop(10, 0.010); my $timenow = time; DXChannel::process(); - + # $DB::trace = 0; - + # do timed stuff, ongoing processing happens one a second if ($timenow != $systime) { - reap if $zombies; + reap() if $zombies; $systime = $timenow; + my $days = int ($systime / 86400); + if ($systime_days != $days) { + $systime_days = $days; + $systime_daystart = $days * 86400; + } + IsoTime::update($systime); DXCron::process(); # do cron jobs DXCommandmode::process(); # process ongoing command mode stuff + DXXml::process(); DXProt::process(); # process ongoing ak1a pcxx stuff - Aranea::process(); DXConnect::process(); DXMsg::process(); DXDb::process(); DXUser::process(); DXDupe::process(); AGWMsg::process(); + BPQMsg::process(); - eval { - Local::process(); # do any localised processing - }; - dbg("Local::process error $@") if $@; + if (defined &Local::process) { + eval { + Local::process(); # do any localised processing + }; + dbg("Local::process error $@") if $@; + } } if ($decease) { last if --$decease <= 0;