use Route::Node;
use Route::User;
use Editable;
+use Mrtg;
+use USDB;
+use UDPMsg;
use Data::Dumper;
use IO::File;
@inqueue = (); # the main input queue, an array of hashes
$systime = 0; # the time now (in seconds)
-$version = "1.49"; # the version no of the software
+$version = "1.51"; # the version no of the software
$starttime = 0; # the starting time of the cluster
#@outstanding_connects = (); # list of outstanding connects
@listeners = (); # list of listeners
use vars qw($VERSION $BRANCH $build $branch);
$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
-$main::build += 12; # add an offset to make it bigger than last system
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0));
+$main::build += 6; # add an offset to make it bigger than last system
$main::build += $VERSION;
$main::branch += $BRANCH;
# set up the basic channel info
# is there one already connected to me - locally?
- my $user = DXUser->get($call);
+ my $user = DXUser->get_current($call);
my $dxchan = DXChannel->get($call);
if ($dxchan) {
my $mess = DXM::msg($lang, ($user && $user->is_node) ? 'concluster' : 'conother', $call, $main::mycall);
# is he locked out ?
my $basecall = $call;
$basecall =~ s/-\d+$//;
- my $baseuser = DXUser->get($basecall);
+ my $baseuser = DXUser->get_current($basecall);
my $lock = $user->lockout if $user;
if ($baseuser && $baseuser->lockout || $lock) {
if (!$user || !defined $lock || $lock) {
# create the channel
- if ($user->is_spider) {
- $dxchan = QXProt->new($call, $conn, $user);
+ if ($user->wantnp) {
+ if ($user->passphrase && $main::me->user->passphrase) {
+ $dxchan = QXProt->new($call, $conn, $user);
+ } else {
+ unless ($user->passphrase) {
+ Log('DXCommand', "$call using NP but has no passphrase");
+ dbg("$call using NP but has no passphrase");
+ }
+ unless ($main::me->user->passphrase) {
+ Log('DXCommand', "$main::mycall using NP but has no passphrase");
+ dbg("$main::mycall using NP but has no passphrase");
+ }
+ already_conn($conn, $call, "Need to exchange passphrases");
+ return;
+ }
} elsif ($user->is_node) {
$dxchan = DXProt->new($call, $conn, $user);
} elsif ($user->is_user) {
}
}
+# remove any outstanding entries on the inqueue after a disconnection (usually)
+sub clean_inqueue
+{
+ my $dxchan = shift;
+ @inqueue = grep {$_->{dxchan} != $dxchan} @inqueue;
+}
+
sub login
{
return \&new_channel;
# disconnect AGW
AGWMsg::finish();
+ # disconnect UDP customers
+ UDPMsg::finish();
+
# end everything else
Msg->event_loop(100, 0.01);
DXUser::finish();
# load Prefixes
dbg("loading prefixes ...");
-Prefix::load();
+my $r = Prefix::init();
+confess $r if $r;
+dbg(USDB::init());
# load band data
dbg("loading band data ...");
push @listeners, $conn;
dbg("External Port: $l->[0] $l->[1]");
}
+
+dbg("AGW Listener") if $AGWMsg::enable;
AGWrestart();
+dbg("UDP Listener") if $UDPMsg::enable;
+UDPMsg::init(\&new_channel);
+
# load bad words
dbg("load badwords: " . (BadWords::load or "Ok"));
}
# start dupe system
+dbg("Starting Dupe system");
DXDupe::init();
# read in system messages
+dbg("Read in Messages");
DXM->init();
# read in command aliases
+dbg("Read in Aliases");
CmdAlias->init();
# initialise the Geomagnetic data engine
+dbg("Start WWV");
Geomag->init();
+dbg("Start WCY");
WCY->init();
# initial the Spot stuff
+dbg("Starting DX Spot system");
Spot->init();
# initialise the protocol engine
-dbg("reading in duplicate spot and WWV info ...");
+dbg("Start Protocol Engines ...");
DXProt->init();
+QXProt->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));