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
# make sure that modules are searched in the order local then perl
BEGIN {
}
+
use DXVars;
use SysVar;
use BBS;
use WCY;
use BadWords;
-use Timer;
+use DXTimer;
use Route;
use Route::Node;
use Route::User;
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)
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) {
$l->close_server;
}
- LogDbg('cluster', "DXSpider V$version, build $build (git: $gitbranch/$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;
import Encode;
$can_encode = 1;
}
+
$gitbranch = 'none';
$gitversion = 'none';
- eval { require Git; };
- unless ($@) {
- import Git;
- # 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") if isdbg('git');
- dbg("Git: V=$v S=$s B=$b g=$g") if isdbg('git');
- $version = $v;
- $build = $b || 0;
- $gitversion = "$g\[r]";
- }
- my @branch = $repo->command([qw{branch}], STDERR=>0);
+ # 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 '*') {
}
}
}
+
$SIG{__DIE__} = $w;
}
# banner
my ($year) = (gmtime)[5];
$year += 1900;
- LogDbg('cluster', "DXSpider V$version, build $build (git: $gitbranch/$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
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
DXCron::process(); # do cron jobs
RBN::process();
- Timer::handler();
+ DXTimer::handler();
DXLog::flushall();
}