package main;
-require 5.10.1;
+require 5.16.1;
+
use warnings;
use vars qw($root $is_win $systime $lockfn @inqueue $starttime $lockfn @outstanding_connects
$clusterport $mycall $decease $routeroot $me $reqreg $bumpexisting
$allowdxby $dbh $dsn $dbuser $dbpass $do_xml $systime_days $systime_daystart
$can_encode $maxconnect_user $maxconnect_node $idle_interval $log_flush_interval
- $broadcast_debug
+ $broadcast_debug $yes $no $user_interval
);
-$lang = 'en'; # default language
-$clusteraddr = '127.0.0.1'; # cluster tcp host address - used for things like console.pl
-$clusterport = 27754; # cluster tcp port
-$yes = 'Yes'; # visual representation of yes
-$no = 'No'; # ditto for no
-$user_interval = 11*60; # the interval between unsolicited prompts if no traffic
+#$lang = 'en'; # default language
+#$clusteraddr = '127.0.0.1'; # cluster tcp host address - used for things like console.pl
+#$clusterport = 27754; # cluster tcp port
+#$yes = 'Yes'; # visual representation of yes
+#$no = 'No'; # ditto for no
+#$user_interval = 11*60; # the interval between unsolicited prompts if no traffic
# 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 Mojolicious 7.26;
use Mojo::IOLoop;
+$DOWARN = 1;
+use DXDebug;
use Msg;
use IntMsg;
use Internet;
use ExtMsg;
use AGWConnect;
use AGWMsg;
-use DXDebug;
use DXLog;
use DXLogPrint;
use DXUtil;
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;
+$lang //= 'en'; # default language
+$clusteraddr //= '127.0.0.1'; # cluster tcp host address - used for things like console.pl
+$clusterport //= 27754; # cluster tcp port
+$yes //= 'Yes'; # visual representation of yes
+$no //= 'No'; # ditto for no
+$user_interval //= 11*60; # the interval between unsolicited prompts if no traffic
+
@inqueue = (); # the main input queue, an array of hashes
$systime = 0; # the time now (in seconds)
@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
+our $allowmultiple = 0; # This is used in conjunction with $bumpexisting, in a rather weird way.
+our $min_reconnection_rate = 5*60; # minimum value of seconds between connections per user to allow co-existing users
+our $max_ssid = 15; # highest ssid to be searched for a spare one on multiple connections
+
+# If $allowmultiple > 0 and the $reconnection_rate is some value of seconds
+# based on the average connection time calculated from the $user->conntimel entries / frequency is
+# less than $reconnection_rate then we assume that there is more than one device (probably HRD) trying
+# to connect "at once". In which case we probe for a spare SSID for a user callsign to allow up to
+# $allowmultiple connections per callsign.
+
$allowdxby = 0; # 1 = allow "dx by <othercall>", 0 - don't allow it
$maxconnect_user = 3; # the maximum no of concurrent connections a user can have at a time
$maxconnect_node = 0; # Ditto but for nodes. In either case if a new incoming connection
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
already_conn($conn, $call, "Maximum no of web connected connects ($Web::maxssid) exceeded");
return;
}
- $call = $newcall;
+ $call = normalise_call($newcall);
+
$user = DXUser::get_current($call);
unless ($user) {
$user = DXUser->new($call);
$user->long($main::mylongitude);
$user->qra($main::mylocator);
}
+ $user->startt($main::systime);
$conn->conns($call);
$dxchan = Web->new($call, $conn, $user);
$dxchan->enhanced(1);
$conn->send_now("C$call");
} else {
# "Normal" connections
+
+ # normalise calls like G1TST-0/G1TST-00/G1TST-01 to G1TST and G1TST-1 respectively
+ my $ncall = normalise_call($call);
+ if ($call ne $ncall) {
+ LogDbg('err', "new_channel login invalid $call converted to $ncall");
+ $msg =~ s/$call/$ncall/;
+ $call = $ncall;
+ }
+ # is it a valid callsign (in format)?
unless (is_callsign($call)) {
already_conn($conn, $call, DXM::msg($lang, "illcall", $call));
return;
}
+ # is he locked out ?
+ my $lock;
+ $conn->conns($call);
+ $user = DXUser::get_current($call);
+ my $basecall = $call;
+ $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) {
if ($user && $user->is_node) {
already_conn($conn, $call, DXM::msg($lang, 'conother', $call, $main::mycall));
return;
}
- if ($bumpexisting) {
- my $ip = $conn->peerhost || 'unknown';
- $dxchan->send_now('D', DXM::msg($lang, 'conbump', $call, $ip));
- LogDbg('DXCommand', "$call bumped off by $ip, disconnected");
- $dxchan->disconnect;
- } else {
- already_conn($conn, $call, DXM::msg($lang, 'conother', $call, $main::mycall));
- return;
+ if ($allowmultiple && $user->is_user) {
+ # determine whether we are a candidate, have we flip-flopped frequently enough?
+ my @lastconns = @{$user->connlist} if $user->connlist;
+ 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;
+ for (; $lastid < $max_ssid && $count < $allowmultiple; ++$lastid) {
+ my $chan = DXChannel::get("$basecall-$lastid");
+ if ($chan) {
+ ++$count;
+ next;
+ }
+ # we have a free call-ssid, save it
+ $newcall = "$basecall-$lastid";
+ last L1;
+ }
+ }
+ }
+
+ # handle "normal" (non-multiple) connections in the existing way
+ if ($call eq $newcall) {
+ if ($bumpexisting) {
+ my $ip = $dxchan->hostname;
+ $dxchan->send_now('D', DXM::msg($lang, 'conbump', $call, $ip));
+ LogDbg('', "$call bumped off by $ip, disconnected");
+ $dxchan->disconnect;
+ } else {
+ already_conn($conn, $call, DXM::msg($lang, 'conother', $call, $main::mycall));
+ return;
+ }
}
+
+ # make sure that the conn has the (possibly) new callsign
+ $conn->conns($newcall);
+ $msg =~ s/$call/$newcall/;
}
-
+
+
# (fairly) politely disconnect people that are connected to too many other places at once
my $r = Route::get($call);
if ($conn->{sort} && $conn->{sort} =~ /^I/ && $r && $user) {
my $c = $user->maxconnect;
my $v;
$v = defined $c ? $c : $m;
- if ($v && @n >= $v) {
+ 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;
}
}
- # is he locked out ?
- my $basecall = $call;
- $basecall =~ s/-\d+$//;
- 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 || "unknown";
- LogDbg('DXCommand', "$call on $host is locked out, disconnected");
- $conn->disconnect;
- return;
- }
- }
-
if ($user) {
$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
} else {
}
# create the channel
+ # NOTE we are SHARING the same $user if $allowmultiple is > 1
+
+ $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($call, $conn, $user);
+ $dxchan = DXCommandmode->new($newcall, $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');
}
# 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]+)/;
- $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
+
+ AnnTalk::init(); # initialise announce cache
+
+
# 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");
}
sub idle_loop
{
BPQMsg::process();
+# DXCommandmode::process(); # process ongoing command mode stuff
+# DXProt::process(); # process ongoing ak1a pcxx stuff
if (defined &Local::process) {
eval {
$main::me->disconnect;
}
- Mojo::IOLoop->stop if --$ending <= 0;
+ Mojo::IOLoop->stop_gracefully if --$ending <= 0;
}
}
$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
+ DXXml::process();
DXConnect::process();
DXMsg::process();
DXDb::process();
DXUser::process();
DXDupe::process();
- DXCron::process(); # do cron jobs
IsoTime::update($systime);
- DXProt::process(); # process ongoing ak1a pcxx stuff
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