package main;
require 5.10.1;
+
use warnings;
use vars qw($root $is_win $systime $lockfn @inqueue $starttime $lockfn @outstanding_connects
# make sure that modules are searched in the order local then perl
BEGIN {
umask 002;
-
+ $SIG{'__WARN__'} = sub { warn $_[0] if $DOWARN };
+
# take into account any local::lib that might be present
eval {
require local::lib;
};
- import local::lib unless ($@);
+ unless ($@) {
+# import local::lib;
+ import local::lib qw(/spider/perl5lib);
+ }
# root of directory tree for this system
$root = "/spider";
$root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'};
+ unshift @INC, "$root/perl5lib" unless grep {$_ eq "$root/perl5lib"} @INC;
unshift @INC, "$root/perl"; # this IS the right way round!
unshift @INC, "$root/local";
}
+
use DXVars;
use SysVar;
-use strict;
-
# order here is important - DXDebug snarfs Carp et al so that Mojo errors go into the debug log
-use DXDebug;
-
use Mojolicious 7.26;
use Mojo::IOLoop;
+$DOWARN = 1;
+use DXDebug;
use Msg;
use IntMsg;
use Internet;
use BBS;
use WCY;
use BadWords;
-use Timer;
+use DXTimer;
use Route;
use Route::Node;
use Route::User;
use DXSql;
use IsoTime;
use BPQMsg;
-
+use RBN;
use Data::Dumper;
use IO::File;
use Fcntl ':flock';
use POSIX ":sys_wait_h";
-use Version;
use Web;
+use vars qw($version $build $gitversion $gitbranch);
+
+use strict;
+
use Local;
our $broadcast_debug; # allow broadcasting of debug info down "enhanced" user connections
our $clssecs; # the amount of cpu time the DXSpider process have consumed
our $cldsecs; # the amount of cpu time any child processes have consumed
+our $allowslashcall; # Allow / in connecting callsigns (ie PA0/G1TLH, or even PA0/G1TLH/2)
# send a message to call on conn and disconnect
$user->long($main::mylongitude);
$user->qra($main::mylocator);
}
- $user->startt($main::systime);
+ $user->startt($main::systime);
$conn->conns($call);
$dxchan = Web->new($call, $conn, $user);
$dxchan->enhanced(1);
}
# is he locked out ?
+ my $lock;
+ $user = DXUser::get_current($call);
+ $conn->conns($call);
my $basecall = $call;
- $basecall =~ s/-\d+$//; # remember this for later multiple user processing
- my $baseuser = DXUser::get_current($basecall);
- my $lock = $user->lockout if $user;
- if ($baseuser && $baseuser->lockout || $lock) {
- if (!$user || !defined $lock || $lock) {
- my $host = $conn->peerhost;
- LogDbg('DXCommand', "$call on $host is locked out, disconnected");
- $conn->disconnect;
- return;
- }
+ $basecall =~ s/-\d+$//; # remember this for later multiple user processing, it's used for other stuff than checking lockout status
+ if ($user) {
+ # make sure we act on any locked status that the actual incoming call has.
+ $lock = $user->lockout;
+ } elsif ($basecall ne $call) {
+ # if there isn't a SSID on the $call, then try the base
+ my $luser = DXUser::get_current($basecall);
+ $lock = $luser->lockout if $luser;
+ }
+
+ # now deal with the lock
+ if ($lock) {
+ my $host = $conn->peerhost;
+ LogDbg('', "$call on $host is locked out, disconnected");
+ $conn->disconnect;
+ return;
}
# set up the basic channel info for "Normal" Users
# is there one already connected to me - locally?
- $user = DXUser::get_current($call);
$dxchan = DXChannel::get($call);
my $newcall = $call;
if ($dxchan) {
my $allow = 0;
if (@lastconns >= $DXUser::maxconnlist) {
$allow = $lastconns[-1]->[0] - $lastconns[0]->[0] < $min_reconnection_rate;
- }
+ }
# search for a spare ssid
L1: for (my $count = $call =~ /-\d+$/?0:1; $allow && $count < $allowmultiple; ) { # remember we have one call already
my $lastid = 1;
if ($bumpexisting) {
my $ip = $dxchan->hostname;
$dxchan->send_now('D', DXM::msg($lang, 'conbump', $call, $ip));
- LogDbg('DXCommand', "$call bumped off by $ip, disconnected");
+ LogDbg('', "$call bumped off by $ip, disconnected");
$dxchan->disconnect;
} else {
already_conn($conn, $call, DXM::msg($lang, 'conother', $call, $main::mycall));
$v = defined $c ? $c : $m;
if ($v && @n >= $v+$allowmultiple) {
my $nodes = join ',', @n;
- LogDbg('DXCommand', "$call has too many connections ($v) at $nodes - disconnected");
+ LogDbg('', "$call has too many connections ($v) at $nodes - disconnected");
already_conn($conn, $call, DXM::msg($lang, 'contomany', $call, $v, $nodes));
return;
}
$user->startt($systime); # mark the start time of this connection
if ($user->is_node) {
- $dxchan = DXProt->new($call, $conn, $user);
+ $dxchan = DXProt->new($call, $conn, $user);
+ } elsif ($user->is_rbn) {
+ $dxchan = RBN->new($newcall, $conn, $user);
} elsif ($user->is_user) {
$dxchan = DXCommandmode->new($newcall, $conn, $user);
} else {
# set callbacks
- $conn->set_error(sub {my $err = shift; LogDbg('DXCommand', "Comms error '$err' received for call $dxchan->{call}"); $dxchan->disconnect(1);});
+ $conn->set_error(sub {my $err = shift; LogDbg('', "Comms error '$err' received for call $dxchan->{call}"); $dxchan->disconnect(1);});
$conn->set_on_eof(sub {$dxchan->disconnect});
$conn->set_rproc(sub {my ($conn,$msg) = @_; $dxchan->rec($msg);});
if ($sort eq 'W') {
$SIG{'INT'} = 'IGNORE';
}
- DXUser::sync;
if (defined &Local::finish) {
eval {
UDPMsg::finish();
# end everything else
+ RBN::finish();
DXUser::finish();
DXDupe::finish();
$l->close_server;
}
- LogDbg('cluster', "DXSpider V$version, build $build (git: $gitversion) ended");
+ LogDbg('cluster', "DXSpider v$version build $build (git: $gitbranch/$gitversion) using perl $^V on $^O ended");
dbg("bye bye everyone - bye bye");
dbgclose();
Logclose();
#
#############################################################
+ chdir $root;
+
$starttime = $systime = time;
$systime_days = int ($systime / 86400);
$systime_daystart = $systime_days * 86400;
}
# open the debug file, set various FHs to be unbuffered
- dbginit($broadcast_debug ? \&DXCommandmode::broadcast_debug : undef);
+ dbginit(undef, $broadcast_debug ? \&DXCommandmode::broadcast_debug : undef);
foreach (@debug) {
dbgadd($_);
}
STDOUT->autoflush(1);
+ # log our path
+ dbg "Perl path: " . join(':', @INC);
# try to load the database
if (DXSql::init($dsn)) {
import Encode;
$can_encode = 1;
}
- eval { require Git; };
- unless ($@) {
- import Git;
+
+ $gitbranch = 'none';
+ $gitversion = 'none';
- # determine the real version number
- my $repo = Git->repository(Directory => "$root/.git");
- if ($repo) {
- my $desc = $repo->command_oneline(['describe', '--long'], STDERR => 0);
- if ($desc) {
- my ($v, $s, $b, $g) = $desc =~ /^([\d.]+)(?:\.(\d+))?-(\d+)-g([0-9a-f]+)/;
- $s ||= '';
- dbg("Git: $desc");
- dbg("Git: V=$v S=$s B=$b g=$g");
- $version = $v;
- $build = $b || 0;
- $gitversion = "$g\[r]";
+ # determine the real Git build number and branch
+ my $desc;
+ eval {$desc = `git --git-dir=$root/.git describe --long`};
+ if (!$@ && $desc) {
+ my ($v, $s, $b, $g) = $desc =~ /^([\d\.]+)(?:\.(\d+))?-(\d+)-g([0-9a-f]+)/;
+ $version = $v;
+ my $subversion = $s || 0; # not used elsewhere
+ $build = $b || 0;
+ $gitversion = "$g\[r]";
+ }
+ if (!$@) {
+ my @branch;
+
+ eval {@branch = `git --git-dir=$root/.git branch`};
+ unless ($@) {
+ for (@branch) {
+ my ($star, $b) = split /\s+/;
+ if ($star eq '*') {
+ $gitbranch = $b;
+ last;
+ }
}
}
}
+
$SIG{__DIE__} = $w;
}
+ # setup location of motd & issue
+ localdata_mv($motd);
+ $motd = localdata($motd);
+ localdata_mv("issue");
+
+
# try to load XML::Simple
DXXml::init();
# banner
my ($year) = (gmtime)[5];
$year += 1900;
- LogDbg('cluster', "DXSpider V$version, build $build (git: $gitversion) started");
+ LogDbg('cluster', "DXSpider v$version build $build (git: $gitbranch/$gitversion) using perl $^V on $^O started");
dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
# load Prefixes
# initialise User file system
dbg("loading user file system ...");
- DXUser::init(1);
+ DXUser::init(4); # version 4 == json format
+
+ Filter::init(); # doesn't do much, but has to be done
+
# look for the sysop and the alias user and complain if they aren't there
{
my $oldsort = $ref->sort;
if ($oldsort ne 'S') {
$ref->sort('S');
- dbg "Resetting node type from $oldsort -> DXSpider ('S')";
+ dbg("Resetting node type from $oldsort -> DXSpider ('S')");
}
$ref = DXUser::get($myalias);
die "$myalias missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
$oldsort = $ref->sort;
if ($oldsort ne 'U') {
$ref->sort('U');
- dbg "Resetting sysop user type from $oldsort -> User ('U')";
+ dbg("Resetting sysop user type from $oldsort -> User ('U')");
}
}
dbg("Start WCY");
WCY->init();
- # initial the Spot stuff
- dbg("Starting DX Spot system");
- Spot->init();
-
# initialise the protocol engine
dbg("Start Protocol Engines ...");
DXProt->init();
+ # read startup script
+ my $script = new Script "startup";
+ $script->run($main::me) if $script;
+
# 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);
# $Route::filterdef->cmd($main::me, 'route', 'accept', "node_default call $mycall" );
#}
+ # initial the Spot stuff
+ dbg("Starting DX Spot system");
+ Spot->init();
+
# read in any existing message headers and clean out old crap
dbg("reading existing message headers ...");
DXMsg->init();
dbg("reading database descriptors ...");
DXDb::load();
+ dbg("starting RBN ...");
+ RBN::init();
+
# starting local stuff
dbg("doing local initialisation ...");
QSL::init(1);
# 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");
}
$main::me->disconnect;
}
- Mojo::IOLoop->stop if --$ending <= 0;
+ Mojo::IOLoop->stop_gracefully if --$ending <= 0;
}
}
IsoTime::update($systime);
DXCommandmode::process(); # process ongoing command mode stuff
DXProt::process(); # process ongoing ak1a pcxx stuff
- DXCron::process(); # do cron jobs
DXXml::process();
DXConnect::process();
DXMsg::process();
DXDb::process();
DXUser::process();
DXDupe::process();
- DXCron::process(); # do cron jobs
IsoTime::update($systime);
DXConnect::process();
DXUser::process();
AGWMsg::process();
-
- Timer::handler();
+ DXCron::process(); # do cron jobs
+ RBN::process();
+
+ DXTimer::handler();
DXLog::flushall();
}
}
-
sub per_minute
{
-
+ RBN::per_minute();
}
sub per_10_minute
{
-
+ RBN::per_10_minute();
}
sub per_hour
{
-
+ RBN::per_hour();
}
sub per_day