change do_pc92 to do_pc9x

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 003ae845becc11c9f73a8292333bfb91e17748c0..2c8b5f65128fa53c4c17599d5f0aa29488fff14e 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -68,7 +68,6 @@ use DXCommandmode;
 use DXProtVars;
 use DXProtout;
 use DXProt;
-use Aranea;
 use DXMsg;
 use DXCron;
 use DXConnect;
@@ -99,10 +98,10 @@ use Mrtg;
 use USDB;
 use UDPMsg;
 use QSL;
-use Thingy;
 use RouteDB;
-use AMsg;
 use DXXml;
+use DXSql;
+use IsoTime;
 
 use Data::Dumper;
 use IO::File;
@@ -117,12 +116,12 @@ 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 $me $reqreg $bumpexisting
-                       $allowdxby $dbh $dsn $dbuser $dbpass
+                       $allowdxby $dbh $dsn $dbuser $dbpass $do_xml $systime_days $systime_daystart
                   );
 
 @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
+$version = "1.53";                             # the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 #@outstanding_connects = ();     # list of outstanding connects
 @listeners = ();                               # list of listeners
@@ -132,11 +131,8 @@ $allowdxby = 0;                                    # 1 = allow "dx by <othercall>", 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)
+($VERSION, $BRANCH) = dxver( q$Revision$);
+$main::build -= 2;                             # fudge (put back for now)
 
 
       
@@ -333,6 +329,8 @@ sub AGWrestart
 #############################################################
 
 $starttime = $systime = time;
+$systime_days = int ($systime / 86400);
+$systime_daystart = $systime_days * 86400; 
 $lang = 'en' unless $lang;
 
 unless ($DB::VERSION) {
@@ -351,14 +349,9 @@ $build += $main::version;
 $build = "$build.$branch" if $branch;
 
 # 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;
-       }
+if (DXSql::init($dsn)) {
+       $dbh = DXSql->new($dsn);
+       $dbh = $dbh->connect($dsn, $dbuser, $dbpass) if $dbh;
 }
 
 # try to load XML::Simple
@@ -466,10 +459,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)) {
@@ -517,12 +511,18 @@ for (;;) {
        
        # 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();