# try to create and lock a lockfile (this isn't atomic but
# should do for now
- my $lockfn = "$root/perl/cluster.lock"; # lock file name
+ $lockfn = "$root/perl/cluster.lck"; # lock file name
if (-e $lockfn) {
open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
my $pid = <CLLOCK>;
open(CLLOCK, ">$lockfn") or die "Can't open Lockfile ($lockfn) $!";
print CLLOCK "$$\n";
close CLLOCK;
+
+ $is_win = ($^O =~ /^MS/ || $^O =~ /^OS-2/) ? 1 : 0; # is it Windows?
+ $systime = time;
}
-use Msg;
use DXVars;
+use Msg;
+use IntMsg;
+use Internet;
+use Listeners;
+use ExtMsg;
+use AGWConnect;
+use AGWMsg;
use DXDebug;
use DXLog;
use DXLogPrint;
use DXUser;
use DXM;
use DXCommandmode;
+use DXProtVars;
+use DXProtout;
use DXProt;
use DXMsg;
use DXCluster;
use DXCron;
use DXConnect;
+use DXBearing;
+use DXDb;
+use DXHash;
+use DXDupe;
use Prefix;
+use Spot;
use Bands;
+use Keps;
+use Minimuf;
+use Sun;
use Geomag;
use CmdAlias;
use Filter;
-use DXDb;
use AnnTalk;
+use BBS;
use WCY;
-use DXDupe;
use BadWords;
+use Timer;
+use Route;
+use Route::Node;
+use Route::User;
use Data::Dumper;
+use IO::File;
use Fcntl ':flock';
use POSIX ":sys_wait_h";
package main;
-#use strict;
-#use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects $zombies $root
-# $lang $myalias @debug $userfn $clusteraddr $clusterport $mycall $decease );
+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
+ );
@inqueue = (); # the main input queue, an array of hashes
$systime = 0; # the time now (in seconds)
-$version = "1.46"; # the version no of the software
+$version = "1.48"; # the version no of the software
$starttime = 0; # the starting time of the cluster
-$lockfn = "cluster.lock"; # lock file name
-@outstanding_connects = (); # list of outstanding connects
-
-# handle disconnections
-sub disconnect
-{
- my $dxchan = shift;
- return if !defined $dxchan;
- $dxchan->disconnect();
-}
+#@outstanding_connects = (); # list of outstanding connects
+@listeners = (); # list of listeners
+
# send a message to call on conn and disconnect
sub already_conn
{
my ($conn, $call, $mess) = @_;
-
+
+ $conn->disable_read(1);
dbg('chan', "-> D $call $mess\n");
$conn->send_now("D$call|$mess");
- sleep(1);
- dbg('chan', "-> Z $call bye\n");
- $conn->send_now("Z$call|bye"); # this will cause 'client' to disconnect
- sleep(1);
- $conn->disconnect();
+ sleep(2);
+ $conn->disconnect;
+}
+
+sub error_handler
+{
+ my $dxchan = shift;
+ $dxchan->{conn}->set_error(undef) if exists $dxchan->{conn};
+ $dxchan->disconnect(1);
}
# handle incoming messages
-sub rec
+sub new_channel
{
- my ($conn, $msg, $err) = @_;
- my $dxchan = DXChannel->get_by_cnum($conn); # get the dxconnnect object for this message
+ my ($conn, $msg) = @_;
+ my ($sort, $call, $line) = DXChannel::decode_input(0, $msg);
+ return unless defined $sort;
- if (!defined $msg || (defined $err && $err)) {
- if ($dxchan) {
- if (defined $err) {
- $conn->disconnect;
- undef $conn;
- $dxchan->conn(undef);
- }
- $dxchan->disconnect;
- } elsif ($conn) {
- $conn->disconnect;
- }
+ # set up the basic channel info
+ # is there one already connected to me - locally?
+ my $user = DXUser->get($call);
+ my $dxchan = DXChannel->get($call);
+ if ($dxchan) {
+ my $mess = DXM::msg($lang, ($user && $user->is_node) ? 'concluster' : 'conother', $call, $main::mycall);
+ already_conn($conn, $call, $mess);
return;
}
- # set up the basic channel info - this needs a bit more thought - there is duplication here
- if (!defined $dxchan) {
- my ($sort, $call, $line) = DXChannel::decode_input(0, $msg);
- return unless defined $sort;
-
- # is there one already connected to me - locally?
- my $user = DXUser->get($call);
- if (DXChannel->get($call)) {
- my $mess = DXM::msg($lang, ($user && $user->is_node) ? 'concluster' : 'conother', $call);
- already_conn($conn, $call, $mess);
- 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 (DXCluster->get_exact($call)) {
- my $mess = DXM::msg($lang, $user->is_node ? 'concluster' : 'conother', $call);
- already_conn($conn, $call, $mess);
- return;
- }
- }
- $user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
+ # is there one already connected elsewhere in the cluster?
+ if ($user) {
+ if (($user->is_node || $call eq $myalias) && !DXCluster->get_exact($call)) {
+ ;
} else {
- if (DXCluster->get_exact($call)) {
- my $mess = DXM::msg($lang, 'conother', $call);
+ if (my $ref = DXCluster->get_exact($call)) {
+ my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->dxchancall);
already_conn($conn, $call, $mess);
return;
}
- $user = DXUser->new($call);
}
-
- # is he locked out ?
- if ($user->lockout) {
- Log('DXCommand', "$call is locked out, disconnected");
- $conn->send_now("Z$call|bye"); # this will cause 'client' to disconnect
+ $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->dxchancall);
+ already_conn($conn, $call, $mess);
return;
}
-
- # create the channel
- $dxchan = DXCommandmode->new($call, $conn, $user) if $user->is_user;
- $dxchan = DXProt->new($call, $conn, $user) if $user->is_node;
- $dxchan = BBS->new($call, $conn, $user) if $user->is_bbs;
- die "Invalid sort of user on $call = $sort" if !$dxchan;
+ $user = DXUser->new($call);
+ }
+
+ # is he locked out ?
+ if ($user->lockout) {
+ Log('DXCommand', "$call is locked out, disconnected");
+ $conn->disconnect;
+ return;
}
+
+ # create the channel
+ $dxchan = DXCommandmode->new($call, $conn, $user) if $user->is_user;
+ $dxchan = DXProt->new($call, $conn, $user) if $user->is_node;
+ $dxchan = BBS->new($call, $conn, $user) if $user->is_bbs;
+ die "Invalid sort of user on $call = $sort" if !$dxchan;
+
+ # check that the conn has a callsign
+ $conn->conns($call) if $conn->isa('IntMsg');
+
+ # set callbacks
+ $conn->set_error(sub {error_handler($dxchan)});
+ $conn->set_rproc(sub {my ($conn,$msg) = @_; rec($dxchan, $conn, $msg);});
+ rec($dxchan, $conn, $msg);
+}
+
+sub rec
+{
+ my ($dxchan, $conn, $msg) = @_;
# queue the message and the channel object for later processing
if (defined $msg) {
sub login
{
- return \&rec;
+ return \&new_channel;
}
# cease running this program, close down all the connections nicely
{
my $dxchan;
- $SIG{'TERM'} = 'IGNORE';
- $SIG{'INT'} = 'IGNORE';
+ unless ($is_win) {
+ $SIG{'TERM'} = 'IGNORE';
+ $SIG{'INT'} = 'IGNORE';
+ }
DXUser::sync;
dbg('local', "Local::finish error $@") if $@;
# disconnect nodes
- foreach $dxchan (DXChannel->get_all()) {
- next unless $dxchan->is_node;
- disconnect($dxchan) unless $dxchan == $DXProt::me;
+ foreach $dxchan (DXChannel->get_all_nodes) {
+ $dxchan->disconnect(2) unless $dxchan == $DXProt::me;
}
- Msg->event_loop(1, 0.05);
- Msg->event_loop(1, 0.05);
- Msg->event_loop(1, 0.05);
- Msg->event_loop(1, 0.05);
- Msg->event_loop(1, 0.05);
- Msg->event_loop(1, 0.05);
+ Msg->event_loop(100, 0.01);
# disconnect users
- foreach $dxchan (DXChannel->get_all()) {
- next if $dxchan->is_node;
- disconnect($dxchan) unless $dxchan == $DXProt::me;
+ foreach $dxchan (DXChannel->get_all_users) {
+ $dxchan->disconnect;
}
- Msg->event_loop(1, 0.05);
- Msg->event_loop(1, 0.05);
- Msg->event_loop(1, 0.05);
- Msg->event_loop(1, 0.05);
- Msg->event_loop(1, 0.05);
- Msg->event_loop(1, 0.05);
+
+ # disconnect AGW
+ AGWMsg::finish();
+
+ # end everything else
+ Msg->event_loop(100, 0.01);
DXUser::finish();
DXDupe::finish();
# close all databases
DXDb::closeall;
-
- dbg('chan', "DXSpider version $version ended");
- Log('cluster', "DXSpider V$version stopped");
+
+ # close all listeners
+ foreach my $l (@listeners) {
+ $l->close_server;
+ }
+
+ dbg('chan', "DXSpider version $version, build $build ended");
+ Log('cluster', "DXSpider V$version, build $build ended");
dbgclose();
Logclose();
unlink $lockfn;
my $cpid;
while (($cpid = waitpid(-1, WNOHANG)) > 0) {
dbg('reap', "cpid: $cpid");
- @outstanding_connects = grep {$_->{pid} != $cpid} @outstanding_connects;
+# Msg->pid_gone($cpid);
$zombies-- if $zombies > 0;
}
dbg('reap', "cpid: $cpid");
die "\$user not defined for $call" if !defined $user;
# normal input
$dxchan->normal($line);
- disconnect($dxchan) if ($dxchan->{state} eq 'bye');
+ $dxchan->disconnect if ($dxchan->{state} eq 'bye');
} elsif ($sort eq 'Z') {
- $dxchan->conn(undef);
- disconnect($dxchan);
+ $dxchan->disconnect;
} elsif ($sort eq 'D') {
; # ignored (an echo)
} else {
my $mins = int $t / 60;
return sprintf "%d %02d:%02d", $days, $hours, $mins;
}
+
+sub AGWrestart
+{
+ AGWMsg::init(\&new_channel);
+}
+
#############################################################
#
# The start of the main line of code
}
STDOUT->autoflush(1);
-Log('cluster', "DXSpider V$version started");
+# calculate build number
+$build = $main::version;
+
+my @fn;
+open(CL, "$main::root/perl/cluster.pl") or die "Cannot open cluster.pl $!";
+while (<CL>) {
+ next unless /^use\s+([\w:_]+)/;
+ push @fn, $1;
+}
+close CL;
+foreach my $fn (@fn) {
+ open(CL, "$main::root/perl/${fn}.pm") or next;
+ while (<CL>) {
+ if (/^#\s+\$Id:\s+[\w\._]+,v\s+(\d+\.\d+)/ ) {
+ $build += $1;
+ last;
+ }
+ }
+ close CL;
+}
+
+Log('cluster', "DXSpider V$version, build $build started");
# banner
-dbg('err', "DXSpider DX Cluster Version $version", "Copyright (c) 1998-2000 Dirk Koopman G1TLH");
+dbg('err', "DXSpider Version $version, build $build started", "Copyright (c) 1998-2001 Dirk Koopman G1TLH");
# load Prefixes
dbg('err', "loading prefixes ...");
DXUser->init($userfn, 1);
# start listening for incoming messages/connects
-dbg('err', "starting listener ...");
-Msg->new_server("$clusteraddr", $clusterport, \&login);
+dbg('err', "starting listeners ...");
+my $conn = IntMsg->new_server($clusteraddr, $clusterport, \&login);
+$conn->conns("Server $clusteraddr/$clusterport");
+push @listeners, $conn;
+dbg('err', "Internal port: $clusteraddr $clusterport");
+foreach my $l (@main::listen) {
+ $conn = ExtMsg->new_server($l->[0], $l->[1], \&login);
+ $conn->conns("Server $l->[0]/$l->[1]");
+ push @listeners, $conn;
+ dbg('err', "External Port: $l->[0] $l->[1]");
+}
+AGWrestart();
# load bad words
dbg('err', "load badwords: " . (BadWords::load or "Ok"));
# prime some signals
-$SIG{INT} = \&cease;
-$SIG{TERM} = \&cease;
-$SIG{HUP} = 'IGNORE';
-$SIG{CHLD} = sub { $zombies++ };
-
-$SIG{PIPE} = sub { dbg('err', "Broken PIPE signal received"); };
-$SIG{IO} = sub { dbg('err', "SIGIO received"); };
-$SIG{WINCH} = $SIG{STOP} = $SIG{CONT} = 'IGNORE';
-$SIG{KILL} = 'DEFAULT'; # as if it matters....
-
-# catch the rest with a hopeful message
-for (keys %SIG) {
- if (!$SIG{$_}) {
-# dbg('chan', "Catching SIG $_");
- $SIG{$_} = sub { my $sig = shift; DXDebug::confess("Caught signal $sig"); };
+unless ($DB::VERSION) {
+ $SIG{INT} = $SIG{TERM} = sub { $decease = 1 };
+}
+
+unless ($is_win) {
+ $SIG{HUP} = 'IGNORE';
+ $SIG{CHLD} = sub { $zombies++ };
+
+ $SIG{PIPE} = sub { dbg('err', "Broken PIPE signal received"); };
+ $SIG{IO} = sub { dbg('err', "SIGIO received"); };
+ $SIG{WINCH} = $SIG{STOP} = $SIG{CONT} = 'IGNORE';
+ $SIG{KILL} = 'DEFAULT'; # as if it matters....
+
+ # catch the rest with a hopeful message
+ for (keys %SIG) {
+ if (!$SIG{$_}) {
+ # dbg('chan', "Catching SIG $_");
+ $SIG{$_} = sub { my $sig = shift; DXDebug::confess("Caught signal $sig"); };
+ }
}
}
# initialise the protocol engine
dbg('err', "reading in duplicate spot and WWV info ...");
+Route::Node::init($mycall, $version);
DXProt->init();
# put in a DXCluster node for us here so we can add users and take them away
for (;;) {
# $DB::trace = 1;
- Msg->event_loop(1, 0.1);
+ Msg->event_loop(10, 0.010);
my $timenow = time;
process_inqueue(); # read in lines from the input queue and despatch them
# $DB::trace = 0;
DXDb::process();
DXUser::process();
DXDupe::process();
-
+ AGWMsg::process();
+
eval {
Local::process(); # do any localised processing
};