package main;
-require 5.10.1;
+require 5.16.1;
use warnings;
$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
+
+package main;
+
+# set default paths, these should be overwritten by DXVars.pm
+use vars qw($data $system $cmd $localcmd $userfn $clusteraddr $clusterport $yes $no $user_interval $lang $local_data);
+
+$lang = 'en'; # default language
+$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 {
mkdir "$root/local_cmd", 02774 unless -d "$root/local_cmd";
# locally stored data lives here
- my $local_data = "$root/local_data";
+ $local_data = "$root/local_data";
mkdir $local_data, 02774 unless -d $local_data;
+ $data = "$root/data";
+ $system = "$root/sys";
+ $cmd = "$root/cmd";
+ $localcmd = "$root/local_cmd";
+ $userfn = "$data/users";
# try to create and lock a lockfile (this isn't atomic but
# should do for now
use BBS;
use WCY;
use BadWords;
-use Timer;
+use DXTimer;
use Route;
use Route::Node;
use Route::User;
use IsoTime;
use BPQMsg;
use RBN;
-
+use DXCIDR;
use Data::Dumper;
use IO::File;
use POSIX ":sys_wait_h";
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)
our $allowslashcall; # Allow / in connecting callsigns (ie PA0/G1TLH, or even PA0/G1TLH/2)
+use vars qw($version $subversion $build $gitversion $gitbranch);
+
# send a message to call on conn and disconnect
sub already_conn
{
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);
$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;
- $user = DXUser::get_current($call);
$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) {
return \&new_channel;
}
-our $ceasing;
+my $ceasing;
# cease running this program, close down all the connections nicely
sub cease
cluck("ceasing") if $ceasing;
return if $ceasing++;
+
+ dbg("DXSpider Ceasing");
unless ($is_win) {
$SIG{'TERM'} = 'IGNORE';
UDPMsg::finish();
# end everything else
+ QSL::finish();
RBN::finish();
- DXUser::finish();
DXDupe::finish();
# close all databases
$l->close_server;
}
- LogDbg('cluster', "DXSpider V$version, build $build (git: $gitbranch/$gitversion) on $^O ended");
+ DXUser::finish();
+
+ LogDbg('cluster', "DXSpider v$version build $build (git: $gitbranch/$gitversion) using perl $^V on $^O ended");
dbg("bye bye everyone - bye bye");
dbgclose();
Logclose();
sub setup_start
{
-
#############################################################
#
# The start of the main line of code
# determine the real Git build number and branch
my $desc;
- eval {$desc = `git describe --long`};
+ 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;
}
if (!$@) {
my @branch;
-
- eval {@branch = `git branch`};
+
+ eval {@branch = `git --git-dir=$root/.git branch`};
unless ($@) {
for (@branch) {
my ($star, $b) = split /\s+/;
$SIG{__DIE__} = $w;
}
+
# setup location of motd & issue
localdata_mv($motd);
$motd = localdata($motd);
# banner
my ($year) = (gmtime)[5];
$year += 1900;
- LogDbg('cluster', "DXSpider V$version, build $build (git: $gitbranch/$gitversion) on $^O started");
- dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
+ LogDbg('cluster', "DXSpider v$version build $build (git: $gitbranch/$gitversion) using perl $^V on $^O started");
+ LogDbg('cluster', "Copyright (c) 1998-$year Dirk Koopman G1TLH");
+ LogDbg('cluster', "Capabilities: ve7cc rbn");
# load Prefixes
dbg("loading prefixes ...");
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
}
}
+
# start listening for incoming messages/connects
dbg("starting listeners ...");
my $conn = IntMsg->new_server($clusteraddr, $clusterport, \&login);
dbg("External Port: $l->[0] $l->[1] using ${pkg}::${login}");
}
+
dbg("AGW Listener") if $AGWMsg::enable;
AGWrestart();
UDPMsg::init(\&new_channel);
# load bad words
- dbg("load badwords: " . (BadWords::load or "Ok"));
+ BadWords::load();
# prime some signals
unless ($DB::VERSION) {
$SIG{INT} = $SIG{TERM} = sub { $ending = 10; };
}
+ # get any bad IPs
+ DXCIDR::init();
+
unless ($is_win) {
$SIG{HUP} = 'IGNORE';
$SIG{CHLD} = sub { $zombies++ };
DXCron::process(); # do cron jobs
RBN::process();
- Timer::handler();
+ DXTimer::handler();
DXLog::flushall();
}
Mojo::IOLoop->start unless Mojo::IOLoop->is_running;
dbg("After Web::start_node");
+
}
setup_start();
exit(0);
+sub END
+{
+ unless ($ceasing) {
+ print "DXSpider Ending\n";
+ cease();
+ }
+}
projects / spider.git / blobdiff