X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=36989dee124c599160c31866d34232dff7753974;hb=cbb522ef802d48991734a4ce803fa6ffa9774588;hp=4b7abd585696bf2dabd4f9c8be63cc43a7072a98;hpb=71620f62f33c447fbc6e54e8c2681b8742e421a6;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 4b7abd58..36989dee 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 #
 # This is the DX cluster 'daemon'. It sits in the middle of its little
 # web of client routines sucking and blowing data where it may.
@@ -10,16 +10,46 @@
 #
 #
 
-require 5.004;
+package main;
+
+require 5.10.1;
+
+use warnings;
+
+use vars qw($root $is_win $systime $lockfn @inqueue $starttime $lockfn @outstanding_connects
+			$zombies @listeners $lang $myalias @debug $userfn $clusteraddr
+			$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 
+		   );
+
+$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 {
 	umask 002;
+	$SIG{'__WARN__'} = sub { warn $_[0] if $DOWARN };
+			
+	# take into account any local::lib that might be present
+	eval {
+		require local::lib;
+	};
+	unless ($@) {
+#		import local::lib;
+		import local::lib qw(/spider/perl5lib);
+	} 
 
 	# root of directory tree for this system
 	$root = "/spider";
 	$root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'};
 
+	unshift @INC, "$root/perl5lib" unless grep {$_ eq "$root/perl5lib"} @INC;
 	unshift @INC, "$root/perl";	# this IS the right way round!
 	unshift @INC, "$root/local";
 
@@ -28,17 +58,27 @@ BEGIN {
 	die "$root/local doesn't exist, please RTFM" unless -d "$root/local";
 	die "$root/local/DXVars.pm doesn't exist, please RTFM" unless -e "$root/local/DXVars.pm";
 
-	mkdir "$root/local_cmd", 0777 unless -d "$root/local_cmd";
+	# create some directories
+	mkdir "$root/local_cmd", 02774 unless -d "$root/local_cmd";
 
+	# locally stored data lives here
+	my $local_data = "$root/local_data";
+	mkdir $local_data, 02774 unless -d $local_data;
 
 	# try to create and lock a lockfile (this isn't atomic but
 	# should do for now
-	$lockfn = "$root/local/cluster.lck";       # lock file name
-	if (-e $lockfn) {
+	$lockfn = "$root/local_data/cluster.lck";       # lock file name
+	if (-w $lockfn) {
 		open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
 		my $pid = <CLLOCK>;
-		chomp $pid;
-		die "Lockfile ($lockfn) and process $pid exist, another cluster running?" if kill 0, $pid;
+		if ($pid) {
+			chomp $pid;
+			if (kill 0, $pid) {
+				warn "Lockfile ($lockfn) and process $pid exist, another cluster running?\n";
+				exit 1;
+			}
+		}
+		unlink $lockfn;
 		close CLLOCK;
 	}
 	open(CLLOCK, ">$lockfn") or die "Can't open Lockfile ($lockfn) $!";
@@ -47,9 +87,18 @@ BEGIN {
 
 	$is_win = ($^O =~ /^MS/ || $^O =~ /^OS-2/) ? 1 : 0; # is it Windows?
 	$systime = time;
+	
 }
 
 use DXVars;
+use SysVar;
+
+# order here is important - DXDebug snarfs Carp et al so that Mojo errors go into the debug log
+use Mojolicious 7.26;
+use Mojo::IOLoop;
+$DOWARN = 1;
+
+use DXDebug;
 use Msg;
 use IntMsg;
 use Internet;
@@ -57,7 +106,6 @@ use Listeners;
 use ExtMsg;
 use AGWConnect;
 use AGWMsg;
-use DXDebug;
 use DXLog;
 use DXLogPrint;
 use DXUtil;
@@ -98,29 +146,25 @@ use Mrtg;
 use USDB;
 use UDPMsg;
 use QSL;
-use RouteDB;
 use DXXml;
 use DXSql;
 use IsoTime;
 use BPQMsg;
+use RBN;
+
 
 use Data::Dumper;
 use IO::File;
 use Fcntl ':flock';
 use POSIX ":sys_wait_h";
-use Version;
+use Web;
 
-use Local;
-
-package main;
+use vars qw($version $build $gitversion $gitbranch);
 
 use strict;
-use vars qw(@inqueue $systime $starttime $lockfn @outstanding_connects
-			$zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr
-			$clusterport $mycall $decease $is_win $routeroot $me $reqreg $bumpexisting
-			$allowdxby $dbh $dsn $dbuser $dbpass $do_xml $systime_days $systime_daystart
-			$can_encode
-		   );
+
+use Local;
+
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
@@ -129,7 +173,29 @@ $starttime = 0;                 # the starting time of the cluster
 @listeners = ();				# list of listeners
 $reqreg = 0;					# 1 = registration required, 2 = deregister people
 $bumpexisting = 1;				# 1 = allow new connection to disconnect old, 0 - don't allow it
+our $allowmultiple = 0;				# This is used in conjunction with $bumpexisting, in a rather weird way.
+our $min_reconnection_rate = 5*60;		# minimum value of seconds between connections per user to allow co-existing users
+our $max_ssid = 15;					# highest ssid to be searched for a spare one on multiple connections
+
+# If $allowmultiple > 0 and the $reconnection_rate is some value of seconds
+# based on the average connection time calculated from the $user->conntimel entries / frequency is
+# less than $reconnection_rate then we assume that there is more than one device (probably HRD) trying
+# to connect "at once". In which case we probe for a spare SSID for a user callsign to allow up to 
+# $allowmultiple connections per callsign. 
+
 $allowdxby = 0;					# 1 = allow "dx by <othercall>", 0 - don't allow it
+$maxconnect_user = 3;			# the maximum no of concurrent connections a user can have at a time
+$maxconnect_node = 0;			# Ditto but for nodes. In either case if a new incoming connection
+								# takes the no of references in the routing table above these numbers
+								# then the connection is refused. This only affects INCOMING connections.
+$idle_interval = 0.500;	        # the wait between invocations of the main idle loop processing.
+$log_flush_interval = 2;		# interval to wait between log flushes
+
+our $ending;					# signal that we are ending;
+our $broadcast_debug;			# allow broadcasting of debug info down "enhanced" user connections
+our $clssecs;					# the amount of cpu time the DXSpider process have consumed
+our $cldsecs;					# the amount of cpu time any child processes have consumed
+our $allowslashcall;			# Allow / in connecting callsigns (ie PA0/G1TLH, or even PA0/G1TLH/2) 
 
 
 # send a message to call on conn and disconnect
@@ -144,13 +210,6 @@ sub already_conn
 	$conn->disconnect;
 }
 
-sub error_handler
-{
-	my $dxchan = shift;
-	$dxchan->{conn}->set_error(undef) if exists $dxchan->{conn};
-	$dxchan->disconnect(1);
-}
-
 # handle incoming messages
 sub new_channel
 {
@@ -158,68 +217,162 @@ sub new_channel
 	my ($sort, $call, $line) = DXChannel::decode_input(0, $msg);
 	return unless defined $sort;
 
-	unless (is_callsign($call)) {
-		already_conn($conn, $call, DXM::msg($lang, "illcall", $call));
-		return;
-	}
-
-	# set up the basic channel info
-	# is there one already connected to me - locally?
-	my $user = DXUser->get_current($call);
-	my $dxchan = DXChannel::get($call);
-	if ($dxchan) {
-		if ($user && $user->is_node) {
-			already_conn($conn, $call, DXM::msg($lang, 'concluster', $call, $main::mycall));
+	my ($dxchan, $user);
+	
+	if (is_webcall($call) && $conn->isa('IntMsg')) {
+		my $newcall = find_next_webcall();
+		unless ($newcall) {
+			already_conn($conn, $call, "Maximum no of web connected connects ($Web::maxssid) exceeded");
 			return;
 		}
-		if ($bumpexisting) {
-			my $ip = $conn->{peerhost} || 'unknown';
-			$dxchan->send_now('D', DXM::msg($lang, 'conbump', $call, $ip));
-			LogDbg('DXCommand', "$call bumped off by $ip, disconnected");
-			$dxchan->disconnect;
-		} else {
-			already_conn($conn, $call, DXM::msg($lang, 'conother', $call, $main::mycall));
+		$call = $newcall;
+		$user = DXUser::get_current($call);
+		unless ($user) {
+			$user = DXUser->new($call);
+			$user->sort('W');
+			$user->wantbeep(0);
+			$user->name('web');
+			$user->qth('on the web');
+			$user->homenode($main::mycall);
+			$user->lat($main::mylatitude);
+			$user->long($main::mylongitude);
+			$user->qra($main::mylocator);
+		}
+		$user->startt($main::systime);	
+		$conn->conns($call);
+		$dxchan = Web->new($call, $conn, $user);
+		$dxchan->enhanced(1);
+		$dxchan->ve7cc(1);
+		$msg =~ s/^A#WEB|/A$call|/;
+		$conn->send_now("C$call");
+	} else {
+		# "Normal" connections
+		unless (is_callsign($call)) {
+			already_conn($conn, $call, DXM::msg($lang, "illcall", $call));
 			return;
 		}
-	}
 
-	# is he locked out ?
-	my $basecall = $call;
-	$basecall =~ s/-\d+$//;
-	my $baseuser = DXUser->get_current($basecall);
-	my $lock = $user->lockout if $user;
-	if ($baseuser && $baseuser->lockout || $lock) {
-		if (!$user || !defined $lock || $lock) {
-			my $host = $conn->{peerhost} || "unknown";
-			LogDbg('DXCommand', "$call on $host is locked out, disconnected");
+		# is he locked out ?
+		$user = DXUser::get_current($call);
+		$conn->conns($call);
+		my $basecall = $call;
+		$basecall =~ s/-\d+$//;	# remember this for later multiple user processing
+		my $lock;
+		if ($user) {
+			# make sure we act on any locked status that the actual incoming call has.
+			$lock = $user->lockout;
+		} elsif ($allowmultiple && $call ne $basecall) {
+		    # if we are allowing multiple connections and there is a basecall minus incoming ssid, use the basecall's lock status
+			$user = DXUser::get_current($basecall);
+			$lock = $user->lockout if $user;
+		}
+
+		# now deal with the lock
+		if ($lock) {
+			my $host = $conn->peerhost;
+			LogDbg('', "$call on $host is locked out, disconnected");
 			$conn->disconnect;
 			return;
 		}
-	}
 
-	if ($user) {
-		$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
-	} else {
-		$user = DXUser->new($call);
-	}
+		# set up the basic channel info for "Normal" Users
+		# is there one already connected to me - locally?
+
+		$dxchan = DXChannel::get($call);
+		my $newcall = $call;
+		if ($dxchan) {
+			if ($user && $user->is_node) {
+				already_conn($conn, $call, DXM::msg($lang, 'conother', $call, $main::mycall));
+				return;
+			}
+			if ($allowmultiple && $user->is_user) {
+				# determine whether we are a candidate, have we flip-flopped frequently enough?
+				my @lastconns = @{$user->connlist} if $user->connlist;
+				my $allow = 0;
+				if (@lastconns >= $DXUser::maxconnlist) {
+					$allow = $lastconns[-1]->[0] - $lastconns[0]->[0] < $min_reconnection_rate;
+				} 
+				# search for a spare ssid
+			L1:	for (my $count = $call =~ /-\d+$/?0:1; $allow && $count < $allowmultiple; ) { # remember we have one call already
+					my $lastid = 1;
+					for (; $lastid < $max_ssid && $count < $allowmultiple; ++$lastid) {
+						my $chan = DXChannel::get("$basecall-$lastid");
+						if ($chan) {
+							++$count;
+							next;
+						}
+						# we have a free call-ssid, save it
+						$newcall = "$basecall-$lastid";
+						last L1;
+					}
+				}
+			}
+
+			# handle "normal" (non-multiple) connections in the existing way
+			if ($call eq $newcall) {
+				if ($bumpexisting) {
+					my $ip = $dxchan->hostname;
+					$dxchan->send_now('D', DXM::msg($lang, 'conbump', $call, $ip));
+					LogDbg('', "$call bumped off by $ip, disconnected");
+					$dxchan->disconnect;
+				} else {
+					already_conn($conn, $call, DXM::msg($lang, 'conother', $call, $main::mycall));
+					return;
+				}
+			}
+
+			# make sure that the conn has the (possibly) new callsign
+			$conn->conns($newcall);
+			$msg =~ s/$call/$newcall/;
+		}
 
-	# create the channel
-	if ($user->is_node) {
-		$dxchan = DXProt->new($call, $conn, $user);
-	} elsif ($user->is_user) {
-		$dxchan = DXCommandmode->new($call, $conn, $user);
-#	} elsif ($user->is_bbs) {                                  # there is no support so
-#		$dxchan = BBS->new($call, $conn, $user);               # don't allow it!!!
-	} else {
-		die "Invalid sort of user on $call = $sort";
-	}
 
-	# check that the conn has a callsign
-	$conn->conns($call) if $conn->isa('IntMsg');
+		# (fairly) politely disconnect people that are connected to too many other places at once
+		my $r = Route::get($call);
+		if ($conn->{sort} && $conn->{sort} =~ /^I/ && $r && $user) {
+			my @n = $r->parents;
+			my $m = $r->isa('Route::Node') ? $maxconnect_node : $maxconnect_user;
+			my $c = $user->maxconnect;
+			my $v;
+			$v = defined $c ? $c : $m;
+			if ($v && @n >= $v+$allowmultiple) {
+				my $nodes = join ',', @n;
+				LogDbg('', "$call has too many connections ($v) at $nodes - disconnected");
+				already_conn($conn, $call, DXM::msg($lang, 'contomany', $call, $v, $nodes));
+				return;
+			}
+		}
+		
+		if ($user) {
+			$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
+		} else {
+			$user = DXUser->new($call);
+		}
+
+		# create the channel
+		# NOTE we are SHARING the same $user if $allowmultiple is > 1
+		
+		$user->startt($systime); # mark the start time of this connection
+		if ($user->is_node) {
+			$dxchan = DXProt->new($call, $conn, $user);	
+		} elsif ($user->is_rbn) {
+			$dxchan = RBN->new($newcall, $conn, $user);
+		} elsif ($user->is_user) {
+			$dxchan = DXCommandmode->new($newcall, $conn, $user);
+		} else {
+			die "Invalid sort of user on $call = $sort";
+		}
+	}
+	
 
 	# set callbacks
-	$conn->set_error(sub {error_handler($dxchan)});
+	$conn->set_error(sub {my $err = shift; LogDbg('', "Comms error '$err' received for call $dxchan->{call}"); $dxchan->disconnect(1);});
+	$conn->set_on_eof(sub {$dxchan->disconnect});
 	$conn->set_rproc(sub {my ($conn,$msg) = @_; $dxchan->rec($msg);});
+	if ($sort eq 'W') {
+		$dxchan->enhanced(1);
+		$dxchan->sort('W');
+	}
 	$dxchan->rec($msg);
 }
 
@@ -229,17 +382,22 @@ sub login
 	return \&new_channel;
 }
 
+our $ceasing;
+
 # cease running this program, close down all the connections nicely
 sub cease
 {
 	my $dxchan;
 
+	cluck("ceasing") if $ceasing; 
+	
+	return if $ceasing++;
+	
 	unless ($is_win) {
 		$SIG{'TERM'} = 'IGNORE';
 		$SIG{'INT'} = 'IGNORE';
 	}
 
-	DXUser::sync;
 
 	if (defined &Local::finish) {
 		eval {
@@ -248,16 +406,6 @@ sub cease
 		dbg("Local::finish error $@") if $@;
 	}
 
-	# disconnect nodes
-	foreach $dxchan (DXChannel::get_all_nodes) {
-	    $dxchan->disconnect(2) unless $dxchan == $main::me;
-	}
-	Msg->event_loop(100, 0.01);
-
-	# disconnect users
-	foreach $dxchan (DXChannel::get_all_users) {
-		$dxchan->disconnect;
-	}
 
 	# disconnect AGW
 	AGWMsg::finish();
@@ -267,7 +415,7 @@ sub cease
 	UDPMsg::finish();
 
 	# end everything else
-	Msg->event_loop(100, 0.01);
+	RBN::finish();
 	DXUser::finish();
 	DXDupe::finish();
 
@@ -279,15 +427,14 @@ sub cease
 		$l->close_server;
 	}
 
-	LogDbg('cluster', "DXSpider V$version, build $subversion.$build ended");
+	LogDbg('cluster', "DXSpider V$version, build $build (git: $gitbranch/$gitversion) ended");
+	dbg("bye bye everyone - bye bye");
 	dbgclose();
 	Logclose();
 
 	$dbh->finish if $dbh;
 
 	unlink $lockfn;
-#	$SIG{__WARN__} = $SIG{__DIE__} =  sub {my $a = shift; cluck($a); };
-	exit(0);
 }
 
 # the reaper of children
@@ -321,242 +468,371 @@ sub AGWrestart
 	AGWMsg::init(\&new_channel);
 }
 
-#############################################################
-#
-# The start of the main line of code
-#
-#############################################################
 
-$starttime = $systime = time;
-$systime_days = int ($systime / 86400);
-$systime_daystart = $systime_days * 86400;
-$lang = 'en' unless $lang;
+sub setup_start
+{
 
-unless ($DB::VERSION) {
-	$SIG{INT} = $SIG{TERM} = \&cease;
-}
+	#############################################################
+	#
+	# The start of the main line of code
+	#
+	#############################################################
 
-# open the debug file, set various FHs to be unbuffered
-dbginit(\&DXCommandmode::broadcast_debug);
-foreach (@debug) {
-	dbgadd($_);
-}
-STDOUT->autoflush(1);
+	$starttime = $systime = time;
+	$systime_days = int ($systime / 86400);
+	$systime_daystart = $systime_days * 86400;
+	$lang = 'en' unless $lang;
 
-# try to load the database
-if (DXSql::init($dsn)) {
-	$dbh = DXSql->new($dsn);
-	$dbh = $dbh->connect($dsn, $dbuser, $dbpass) if $dbh;
-}
+	unless ($DB::VERSION) {
+		$SIG{INT} = $SIG{TERM} = \&cease;
+	}
 
-# try to load Encode
-{
-	local $^W = 0;
-	my $w = $SIG{__DIE__};
-	$SIG{__DIE__} = 'IGNORE';
-	eval { require Encode; };
-	unless ($@) {
-		import Encode;
-		$can_encode = 1;
+	# open the debug file, set various FHs to be unbuffered
+	dbginit($broadcast_debug ? \&DXCommandmode::broadcast_debug : undef);
+	foreach (@debug) {
+		dbgadd($_);
+	}
+	STDOUT->autoflush(1);
+
+	# log our path
+	dbg "Perl path: " . join(':', @INC);
+	
+	# try to load the database
+	if (DXSql::init($dsn)) {
+		$dbh = DXSql->new($dsn);
+		$dbh = $dbh->connect($dsn, $dbuser, $dbpass) if $dbh;
+	}
+
+	# try to load Encode and Git
+	{
+		local $^W = 0;
+		my $w = $SIG{__DIE__};
+		$SIG{__DIE__} = 'IGNORE';
+		eval { require Encode; };
+		unless ($@) {
+			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);
+				for (@branch) {
+					my ($star, $b) = split /\s+/;
+					if ($star eq '*') {
+						$gitbranch = $b;
+						last;
+					}
+				}
+			}
+		}
+		$SIG{__DIE__} = $w;
 	}
-	$SIG{__DIE__} = $w;
-}
 
-# try to load XML::Simple
-DXXml::init();
+	# try to load XML::Simple
+	DXXml::init();
+
+	# banner
+	my ($year) = (gmtime)[5];
+	$year += 1900;
+	LogDbg('cluster', "DXSpider V$version, build $build (git: $gitbranch/$gitversion) started");
+	dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
+
+	# load Prefixes
+	dbg("loading prefixes ...");
+	dbg(USDB::init());
+	my $r = Prefix::init();
+	confess $r if $r;
+
+	# load band data
+	dbg("loading band data ...");
+	Bands::load();
+
+	# initialise User file system
+	dbg("loading user file system ...");
+	DXUser::init(4);			# version 4 == json format
+
+	Filter::init();				# doesn't do much, but has to be done
+	
+
+	# look for the sysop and the alias user and complain if they aren't there
+	{
+		die "\$myalias \& \$mycall are the same ($mycall)!, they must be different (hint: make \$mycall = '${mycall}-2';). Oh and don't forget to rerun create_sysop.pl!" if $mycall eq $myalias;
+		my $ref = DXUser::get($mycall);
+		die "$mycall missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
+		my $oldsort = $ref->sort;
+		if ($oldsort ne 'S') {
+			$ref->sort('S');
+			dbg("Resetting node type from $oldsort -> DXSpider ('S')");
+		}
+		$ref = DXUser::get($myalias);
+		die "$myalias missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
+		$oldsort = $ref->sort;
+		if ($oldsort ne 'U') {
+			$ref->sort('U');
+			dbg("Resetting sysop user type from $oldsort -> User ('U')");
+		}
+	}
 
-# banner
-my ($year) = (gmtime)[5];
-$year += 1900;
-LogDbg('cluster', "DXSpider V$version, build $subversion.$build started");
-dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
+	# start listening for incoming messages/connects
+	dbg("starting listeners ...");
+	my $conn = IntMsg->new_server($clusteraddr, $clusterport, \&login);
+	$conn->conns("Server $clusteraddr/$clusterport using IntMsg");
+	push @listeners, $conn;
+	dbg("Internal port: $clusteraddr $clusterport using IntMsg");
+	foreach my $l (@main::listen) {
+		no strict 'refs';
+		my $pkg = $l->[2] || 'ExtMsg';
+		my $login = $l->[3] || 'login';
+
+		$conn = $pkg->new_server($l->[0], $l->[1], \&{"${pkg}::${login}"});
+		$conn->conns("Server $l->[0]/$l->[1] using ${pkg}::${login}");
+		push @listeners, $conn;
+		dbg("External Port: $l->[0] $l->[1] using ${pkg}::${login}");
+	}
 
-# load Prefixes
-dbg("loading prefixes ...");
-dbg(USDB::init());
-my $r = Prefix::init();
-confess $r if $r;
+	dbg("AGW Listener") if $AGWMsg::enable;
+	AGWrestart();
 
-# load band data
-dbg("loading band data ...");
-Bands::load();
+	dbg("BPQ Listener") if $BPQMsg::enable;
+	BPQMsg::init(\&new_channel);
 
-# initialise User file system
-dbg("loading user file system ...");
-DXUser->init($userfn, 1);
+	dbg("UDP Listener") if $UDPMsg::enable;
+	UDPMsg::init(\&new_channel);
 
-# look for the sysop and the alias user and complain if they aren't there
-{
-	my $ref = DXUser->get($mycall);
-	die "$mycall missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
-	$ref = DXUser->get($myalias);
-	die "$myalias missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
-}
+	# load bad words
+	dbg("load badwords: " . (BadWords::load or "Ok"));
 
-# start listening for incoming messages/connects
-dbg("starting listeners ...");
-my $conn = IntMsg->new_server($clusteraddr, $clusterport, \&login);
-$conn->conns("Server $clusteraddr/$clusterport using IntMsg");
-push @listeners, $conn;
-dbg("Internal port: $clusteraddr $clusterport using IntMsg");
-foreach my $l (@main::listen) {
-	no strict 'refs';
-	my $pkg = $l->[2] || 'ExtMsg';
-	my $login = $l->[3] || 'login';
-
-	$conn = $pkg->new_server($l->[0], $l->[1], \&{"${pkg}::${login}"});
-	$conn->conns("Server $l->[0]/$l->[1] using ${pkg}::${login}");
-	push @listeners, $conn;
-	dbg("External Port: $l->[0] $l->[1] using ${pkg}::${login}");
-}
+	# prime some signals
+	unless ($DB::VERSION) {
+		$SIG{INT} = $SIG{TERM} = sub { $ending = 10; };
+	}
 
-dbg("AGW Listener") if $AGWMsg::enable;
-AGWrestart();
+	unless ($is_win) {
+		$SIG{HUP} = 'IGNORE';
+		$SIG{CHLD} = sub { $zombies++ };
+
+		$SIG{PIPE} = sub { 	dbg("Broken PIPE signal received"); };
+		$SIG{IO} = sub { 	dbg("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("Catching SIG $_") if isdbg('chan');
+				$SIG{$_} = sub { my $sig = shift;	DXDebug::confess("Caught signal $sig");  };
+			}
+		}
+	}
 
-dbg("BPQ Listener") if $BPQMsg::enable;
-BPQMsg::init(\&new_channel);
+	# 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("Start Protocol Engines ...");
+	DXProt->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));
+	$routeroot->do_pc9x(1);
+	$routeroot->via_pc92(1);
+
+	# make sure that there is a routing OUTPUT node default file
+	#unless (Filter::read_in('route', 'node_default', 0)) {
+	#	my $dxcc = $main::me->dxcc;
+	#	$Route::filterdef->cmd($main::me, 'route', 'accept', "node_default call $mycall" );
+	#}
+
+	# read in any existing message headers and clean out old crap
+	dbg("reading existing message headers ...");
+	DXMsg->init();
+	DXMsg::clean_old();
+
+	# read in any cron jobs
+	dbg("reading cron jobs ...");
+	DXCron->init();
+
+	# read in database desriptors
+	dbg("reading database descriptors ...");
+	DXDb::load();
+
+	dbg("starting RBN ...");
+	RBN::init();
+
+	# starting local stuff
+	dbg("doing local initialisation ...");
+	QSL::init(1);
+	if (defined &Local::init) {
+		eval {
+			Local::init();
+		};
+		dbg("Local::init error $@") if $@;
+	}
 
-dbg("UDP Listener") if $UDPMsg::enable;
-UDPMsg::init(\&new_channel);
 
-# load bad words
-dbg("load badwords: " . (BadWords::load or "Ok"));
+	# this, such as it is, is the main loop!
+	dbg("orft we jolly well go ...");
+	my $script = new Script "startup";
+	$script->run($main::me) if $script;
 
-# prime some signals
-unless ($DB::VERSION) {
-	$SIG{INT} = $SIG{TERM} = sub { $decease = 1 };
+	#open(DB::OUT, "|tee /tmp/aa");
 }
 
-unless ($is_win) {
-	$SIG{HUP} = 'IGNORE';
-	$SIG{CHLD} = sub { $zombies++ };
+our $io_disconnected;
+
+sub idle_loop
+{
+	BPQMsg::process();
+#	DXCommandmode::process(); # process ongoing command mode stuff
+#	DXProt::process();		# process ongoing ak1a pcxx stuff
+
+	if (defined &Local::process) {
+		eval {
+			Local::process();	# do any localised processing
+		};
+		dbg("Local::process error $@") if $@;
+	}
+
+	while ($ending) {
+		my $dxchan;
+
+		dbg("DXSpider Ending $ending");
+
+		unless ($io_disconnected++) {
 
-	$SIG{PIPE} = sub { 	dbg("Broken PIPE signal received"); };
-	$SIG{IO} = sub { 	dbg("SIGIO received"); };
-	$SIG{WINCH} = $SIG{STOP} = $SIG{CONT} = 'IGNORE';
-	$SIG{KILL} = 'DEFAULT';     # as if it matters....
+			# disconnect users
+			foreach $dxchan (DXChannel::get_all_users) {
+				$dxchan->disconnect;
+			}
 
-	# catch the rest with a hopeful message
-	for (keys %SIG) {
-		if (!$SIG{$_}) {
-			#		dbg("Catching SIG $_") if isdbg('chan');
-			$SIG{$_} = sub { my $sig = shift;	DXDebug::confess("Caught signal $sig");  };
+			# disconnect nodes
+			foreach $dxchan (DXChannel::get_all_nodes) {
+				next if $dxchan == $main::me;
+				$dxchan->disconnect(2);
+			}
+			$main::me->disconnect;
 		}
+
+		Mojo::IOLoop->stop if --$ending <= 0;
 	}
 }
 
-# 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("Start Protocol Engines ...");
-DXProt->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));
-$routeroot->do_pc9x(1);
-$routeroot->via_pc92(1);
-
-# make sure that there is a routing OUTPUT node default file
-#unless (Filter::read_in('route', 'node_default', 0)) {
-#	my $dxcc = $main::me->dxcc;
-#	$Route::filterdef->cmd($main::me, 'route', 'accept', "node_default call $mycall" );
-#}
-
-# read in any existing message headers and clean out old crap
-dbg("reading existing message headers ...");
-DXMsg->init();
-DXMsg::clean_old();
-
-# read in any cron jobs
-dbg("reading cron jobs ...");
-DXCron->init();
-
-# read in database desriptors
-dbg("reading database descriptors ...");
-DXDb::load();
-
-# starting local stuff
-dbg("doing local initialisation ...");
-QSL::init(1);
-if (defined &Local::init) {
-	eval {
-		Local::init();
-	};
-	dbg("Local::init error $@") if $@;
+sub per_sec
+{
+	my $timenow = time;
+
+	reap() if $zombies;
+	$systime = $timenow;
+	my $days = int ($systime / 86400);
+	if ($systime_days != $days) {
+		$systime_days = $days;
+		$systime_daystart = $days * 86400;
+	}
+	IsoTime::update($systime);
+	DXCommandmode::process(); # process ongoing command mode stuff
+	DXProt::process();		# process ongoing ak1a pcxx stuff
+	DXXml::process();
+	DXConnect::process();
+	DXMsg::process();
+	DXDb::process();
+	DXUser::process();
+	DXDupe::process();
+	IsoTime::update($systime);
+	DXConnect::process();
+	DXUser::process();
+	AGWMsg::process();
+	DXCron::process();			# do cron jobs
+	RBN::process();
+
+	Timer::handler();
+	DXLog::flushall();
 }
 
+sub per_10_sec
+{
 
-# this, such as it is, is the main loop!
-dbg("orft we jolly well go ...");
-my $script = new Script "startup";
-$script->run($main::me) if $script;
+}
 
-#open(DB::OUT, "|tee /tmp/aa");
+sub per_minute
+{
+	RBN::per_minute();
+}
 
-for (;;) {
-#	$DB::trace = 1;
+sub per_10_minute
+{
+	RBN::per_10_minute();
+}
 
-	Msg->event_loop(10, 0.010);
-	my $timenow = time;
+sub per_hour
+{
+	RBN::per_hour();
+}
 
-	DXChannel::process();
+sub per_day
+{
 
-#	$DB::trace = 0;
+}
 
-	# do timed stuff, ongoing processing happens one a second
-	if ($timenow != $systime) {
-		reap() if $zombies;
-		$systime = $timenow;
-		my $days = int ($systime / 86400);
-		if ($systime_days != $days) {
-			$systime_days = $days;
-			$systime_daystart = $days * 86400;
-		}
-		IsoTime::update($systime);
-		DXCron::process();      # do cron jobs
-		DXCommandmode::process(); # process ongoing command mode stuff
-		DXXml::process();
-		DXProt::process();		# process ongoing ak1a pcxx stuff
-		DXConnect::process();
-		DXMsg::process();
-		DXDb::process();
-		DXUser::process();
-		DXDupe::process();
-		AGWMsg::process();
-		BPQMsg::process();
-
-		if (defined &Local::process) {
-			eval {
-				Local::process();       # do any localised processing
-			};
-			dbg("Local::process error $@") if $@;
-		}
-	}
-	if ($decease) {
-		last if --$decease <= 0;
-	}
+sub start_node
+{
+	dbg("Before Web::start_node");
+
+	Mojo::IOLoop->start unless Mojo::IOLoop->is_running;
+
+	dbg("After Web::start_node");
 }
+
+setup_start();
+
+my $main_loop = Mojo::IOLoop->recurring($idle_interval => \&idle_loop);
+my $log_flush_loop = Mojo::IOLoop->recurring($log_flush_interval => \&DXLog::flushall);
+my $cpusecs_loop = Mojo::IOLoop->recurring(5 => sub {my @t = times; $clssecs = $t[0]+$t[1]; $cldsecs = $t[2]+$t[3]});
+my $persec =  Mojo::IOLoop->recurring(1 => \&per_sec);
+my $per10sec =  Mojo::IOLoop->recurring(10 => \&per_10_sec);
+my $permin =  Mojo::IOLoop->recurring(60 => \&per_minute);
+my $per10min =  Mojo::IOLoop->recurring(600 => \&per_10_minute);
+my $perhour =  Mojo::IOLoop->recurring(3600 => \&per_hour);
+my $perday =  Mojo::IOLoop->recurring(86400 => \&per_day);
+
+start_node();
+
 cease(0);
-exit(0);
 
+exit(0);