X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=f0fced78adf0bfc93e47416421c83cb3f50866b8;hb=5f1ef9f393b44a1e4b29b290332c386cfadcb5de;hp=d20b539c5b01447d5edc8d796752c13685e35904;hpb=27854d917fc31b9f2dd184c24e6f38265a3a09e8;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index d20b539c..f0fced78 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -10,6 +10,8 @@
 # $Id$
 # 
 
+require 5.004;
+
 # make sure that modules are searched in the order local then perl
 BEGIN {
 	# root of directory tree for this system
@@ -18,10 +20,16 @@ BEGIN {
 	
 	unshift @INC, "$root/perl";	# this IS the right way round!
 	unshift @INC, "$root/local";
+
+#	require Exporter;
+#	$Exporter::Verbose = 1;
 }
 
 use Msg;
 use DXVars;
+use DXDebug;
+use DXLog;
+use DXLogPrint;
 use DXUtil;
 use DXChannel;
 use DXUser;
@@ -30,7 +38,6 @@ use DXCommandmode;
 use DXProt;
 use DXMsg;
 use DXCluster;
-use DXDebug;
 use DXCron;
 use DXConnect;
 use Prefix;
@@ -43,8 +50,9 @@ package main;
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
-$version = 1.3;					# the version no of the software
-
+$version = "1.15";				# the version no of the software
+$starttime = 0;                 # the starting time of the cluster   
+ 
 # handle disconnections
 sub disconnect
 {
@@ -53,6 +61,18 @@ sub disconnect
 	$dxchan->disconnect();
 }
 
+# send a message to call on conn and disconnect
+sub already_conn
+{
+	my ($conn, $call, $mess) = @_;
+	
+	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
+}
+
 # handle incoming messages
 sub rec
 {
@@ -68,36 +88,35 @@ sub rec
 	if (!defined $dxchan) {
 		my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
 		
-		# is there one already connected?
-		if (DXChannel->get($call)) {
-			my $mess = DXM::msg($lang, 'conother', $call);
-			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
-			return;
+		# is there one already connected elsewhere in the cluster (and not a cluster)
+		my $user = DXUser->get($call);
+		if ($user) {
+			if (($user->sort eq 'A' || $call eq $myalias) && !DXCluster->get_exact($call)) {
+				;
+			} else {
+				if (DXCluster->get($call) || DXChannel->get($call)) {
+					my $mess = DXM::msg($lang, $user->sort eq 'A' ? 'concluster' : 'conother', $call);
+					already_conn($conn, $call, $mess);
+					return;
+				}
+			}
+			$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
+		} else {
+			if (DXCluster->get($call)) {
+				my $mess = DXM::msg($lang, 'conother', $call);
+				already_conn($conn, $call, $mess);
+				return;
+			}
+			$user = DXUser->new($call);
 		}
-		
-		# is there one already connected elsewhere in the cluster?
-		if (DXCluster->get($call)) {
-			my $mess = DXM::msg($lang, 'concluster', $call);
-			dbg('chan', "-> D $call $mess\n"); 
-			$conn->send_now("D$call|$mess");
-			sleep(1);
-			dbg('chan', "-> Z $call bye\n");
+
+		# 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
 			return;
 		}
-		
-		my $user = DXUser->get($call);
-		if (!defined $user) {
-			$user = DXUser->new($call);
-		} else {
-			$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
-		}
-		
-		
+
 		# create the channel
 		$dxchan = DXCommandmode->new($call, $conn, $user) if ($user->sort eq 'U');
 		$dxchan = DXProt->new($call, $conn, $user) if ($user->sort eq 'A');
@@ -123,11 +142,18 @@ sub cease
 {
 	my $dxchan;
 	foreach $dxchan (DXChannel->get_all()) {
-		disconnect($dxchan);
+		disconnect($dxchan) unless $dxchan == $DXProt::me;
 	}
+	Log('cluster', "DXSpider V$version stopped");
 	exit(0);
 }
 
+# the reaper of children
+sub reap
+{
+	my $cpid = wait;
+}
+
 # this is where the input queue is dealt with and things are dispatched off to other parts of
 # the cluster
 sub process_inqueue
@@ -140,13 +166,13 @@ sub process_inqueue
 	my ($sort, $call, $line) = $data =~ /^(\w)(\S+)\|(.*)$/;
 	
 	# do the really sexy console interface bit! (Who is going to do the TK interface then?)
-	dbg('chan', "<- $sort $call $line\n");
+	dbg('chan', "<- $sort $call $line\n") unless $sort eq 'D';
 	
 	# handle A records
 	my $user = $dxchan->user;
-	if ($sort eq 'A') {
-		$dxchan->start($line);  
-	} elsif ($sort eq 'D') {
+	if ($sort eq 'A' || $sort eq 'O') {
+		$dxchan->start($line, $sort);  
+	} elsif ($sort eq 'I') {
 		die "\$user not defined for $call" if !defined $user;
 		
 		# normal input
@@ -155,24 +181,39 @@ sub process_inqueue
 		disconnect($dxchan) if ($dxchan->{state} eq 'bye');
 	} elsif ($sort eq 'Z') {
 		disconnect($dxchan);
+	} elsif ($sort eq 'D') {
+		;                       # ignored (an echo)
 	} else {
 		print STDERR atime, " Unknown command letter ($sort) received from $call\n";
 	}
 }
 
+sub uptime
+{
+	my $t = $systime - $starttime;
+	my $days = int $t / 86400;
+	$t -= $days * 86400;
+	my $hours = int $t / 3600;
+	$t -= $hours * 3600;
+	my $mins = int $t / 60;
+	return sprintf "%d %02d:%02d", $days, $hours, $mins;
+}
 #############################################################
 #
 # The start of the main line of code 
 #
 #############################################################
 
+$starttime = $systime = time;
+
 # open the debug file, set various FHs to be unbuffered
-dbginit($debugfn);
 foreach (@debug) {
 	dbgadd($_);
 }
 STDOUT->autoflush(1);
 
+Log('cluster', "DXSpider V$version started");
+
 # banner
 print "DXSpider DX Cluster Version $version\nCopyright (c) 1998 Dirk Koopman G1TLH\n";
 
@@ -196,6 +237,7 @@ Msg->new_server("$clusteraddr", $clusterport, \&login);
 $SIG{'INT'} = \&cease;
 $SIG{'TERM'} = \&cease;
 $SIG{'HUP'} = 'IGNORE';
+$SIG{'CHLD'} = \&reap;
 
 # read in system messages
 DXM->init();
@@ -203,21 +245,24 @@ DXM->init();
 # read in command aliases
 CmdAlias->init();
 
-# initialise the protocol engine
-DXProt->init();
-
 # initialise the Geomagnetic data engine
 Geomag->init();
 
 # initial the Spot stuff
 Spot->init();
 
+# initialise the protocol engine
+print "reading in duplicate spot and WWV info ...\n";
+DXProt->init();
+
+
 # put in a DXCluster node for us here so we can add users and take them away
 DXNode->new(0, $mycall, 0, 1, $DXProt::myprot_version); 
 
-# read in any existing message headers
+# read in any existing message headers and clean out old crap
 print "reading existing message headers\n";
 DXMsg->init();
+DXMsg::clean_old();
 
 # read in any cron jobs
 print "reading cron jobs\n";
@@ -241,6 +286,9 @@ for (;;) {
 		DXProt::process();		# process ongoing ak1a pcxx stuff
 		DXConnect::process();
 	}
+	if ($decease) {
+		last if --$decease <= 0;
+	}
 }