use DXProtout;
use DXProt;
use DXMsg;
-use DXCluster;
use DXCron;
use DXConnect;
use DXBearing;
use DXHash;
use DXDupe;
use Prefix;
+use Spot;
use Bands;
use Keps;
use Minimuf;
use WCY;
use BadWords;
use Timer;
+use Route;
+use Route::Node;
+use Route::User;
use Data::Dumper;
use IO::File;
use strict;
use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects
$zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr
- $clusterport $mycall $decease $build $is_win
+ $clusterport $mycall $decease $build $is_win $routeroot
);
@inqueue = (); # the main input queue, an array of hashes
$systime = 0; # the time now (in seconds)
-$version = "1.47"; # the version no of the software
+$version = "1.48"; # the version no of the software
$starttime = 0; # the starting time of the cluster
#@outstanding_connects = (); # list of outstanding connects
@listeners = (); # list of listeners
sub already_conn
{
my ($conn, $call, $mess) = @_;
-
+
+ $conn->disable_read(1);
dbg('chan', "-> D $call $mess\n");
$conn->send_now("D$call|$mess");
sleep(2);
return;
}
- # is there one already connected elsewhere in the cluster?
if ($user) {
- if (($user->is_node || $call eq $myalias) && !DXCluster->get_exact($call)) {
- ;
- } else {
- if (my $ref = DXCluster->get_exact($call)) {
- my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->call);
- already_conn($conn, $call, $mess);
- return;
- }
- }
$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
} else {
- if (my $ref = DXCluster->get_exact($call)) {
- my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->call);
- already_conn($conn, $call, $mess);
- return;
- }
$user = DXUser->new($call);
}
{
my $dxchan;
- $SIG{'TERM'} = 'IGNORE';
- $SIG{'INT'} = 'IGNORE';
+ unless ($is_win) {
+ $SIG{'TERM'} = 'IGNORE';
+ $SIG{'INT'} = 'IGNORE';
+ }
DXUser::sync;
push @fn, $1;
}
close CL;
+my $subbuild;
foreach my $fn (@fn) {
+ $fn =~ s|::|/|g;
open(CL, "$main::root/perl/${fn}.pm") or next;
while (<CL>) {
- if (/^#\s+\$Id:\s+[\w\._]+,v\s+(\d+\.\d+)/ ) {
+ if (/^#\s+\$Id:\s+[\w\._]+,v\s+(\d+\.\d+)\.?(\d+.\d+)?/ ) {
$build += $1;
+ $subbuild += $2 if $2;
last;
}
}
close CL;
}
+$build = "$build.$subbuild" if $subbuild;
Log('cluster', "DXSpider V$version, build $build started");
dbg('err', "load badwords: " . (BadWords::load or "Ok"));
# prime some signals
+unless ($DB::VERSION) {
+ $SIG{INT} = $SIG{TERM} = sub { $decease = 1 };
+}
+
unless ($is_win) {
- unless ($DB::VERSION) {
- $SIG{INT} = \&cease;
- $SIG{TERM} = \&cease;
- }
$SIG{HUP} = 'IGNORE';
$SIG{CHLD} = sub { $zombies++ };
DXProt->init();
# put in a DXCluster node for us here so we can add users and take them away
-DXNode->new($DXProt::me, $mycall, 0, 1, $DXProt::myprot_version);
+$routeroot = Route::Node->new($mycall, $version*100+5300, Route::here($DXProt::me->here)|Route::conf($DXProt::me->conf));
+
+# make sure that there is a routing OUTPUT node default file
+unless (Filter::read_in('route', 'node_default', 0)) {
+ my $dxcc = $DXProt::me->dxcc;
+ $Route::filterdef->cmd($DXProt::me, 'route', 'accept', "node_default call_dxcc $dxcc" );
+}
# read in any existing message headers and clean out old crap
dbg('err', "reading existing message headers ...");