X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=ad71b688ac7ce8e86f46f685deb4e6d3a06c1259;hb=69c8aeb338cc485103e289fbab7ec4e7e056ed20;hp=4c65e86858acb7c7711152562579c06d0384276f;hpb=50bafbfa099ff0847beeb30e41bc62a361ef0536;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 4c65e868..ad71b688 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -27,6 +27,7 @@ use Msg;
 use DXVars;
 use DXDebug;
 use DXLog;
+use DXLogPrint;
 use DXUtil;
 use DXChannel;
 use DXUser;
@@ -47,8 +48,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.13";				# the version no of the software
+$starttime = 0;                 # the starting time of the cluster   
+ 
 # handle disconnections
 sub disconnect
 {
@@ -57,6 +59,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
 {
@@ -72,28 +86,30 @@ 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?
-		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");
-			$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' && !DXCluster->get_exact($call)) {
+				;
+			} elsif ($user->sort eq 'U' && $call eq $main::myalias && !DXCluster->get_exact($call)) {
+				;
+			} else {
+				if (DXChannel->get($call)) {
+					my $mess = DXM::msg($lang, $user->sort eq 'A' ? 'concluster' : 'conother', $call);
+					already_conn($conn, $call, $mess);
+					return;
+				}
+			}
+		} else {
+			if (DXChannel->get($call)) {
+				my $mess = DXM::msg($lang, 'conother', $call);
+				already_conn($conn, $call, $mess);
+				return;
+			}
 		}
+
 		
+		# the user MAY have an SSID if local, but otherwise doesn't
 		my $user = DXUser->get($call);
 		if (!defined $user) {
 			$user = DXUser->new($call);
@@ -101,7 +117,13 @@ sub rec
 			$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
 		}
 		
-		
+		# 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;
+		}
+
 		# 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');
@@ -129,9 +151,16 @@ sub cease
 	foreach $dxchan (DXChannel->get_all()) {
 		disconnect($dxchan);
 	}
+	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
@@ -144,13 +173,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
@@ -159,23 +188,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
 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";
 
@@ -199,6 +244,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();
@@ -218,9 +264,10 @@ Spot->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";
@@ -244,6 +291,9 @@ for (;;) {
 		DXProt::process();		# process ongoing ak1a pcxx stuff
 		DXConnect::process();
 	}
+	if ($decease) {
+		last if --$decease <= 0;
+	}
 }