use DXProtVars;
use DXProtout;
use DXProt;
-use Aranea;
use DXMsg;
use DXCron;
use DXConnect;
use USDB;
use UDPMsg;
use QSL;
-use Thingy;
use RouteDB;
-use AMsg;
use DXXml;
+use DXSql;
+use IsoTime;
use Data::Dumper;
use IO::File;
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
);
@inqueue = (); # the main input queue, an array of hashes
$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)
+$main::build -= 3; # fudge (put back for now)
$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
# 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));
# do timed stuff, ongoing processing happens one a second
if ($timenow != $systime) {
- reap if $zombies;
- $systime = $timenow;
+ reap() if $zombies;
+ IsoTime::update($systime = $timenow);
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();