X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=b4cb11c0a898700d842a072e0c0d218e40ee1eac;hb=9e6f237bf04fc102b519085e171d81b28d418ccb;hp=1eb8207806716033fbb16e9014b7e4fa9fd68d21;hpb=f91e843bd91e37a969d0be7e1168649b076e5170;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 1eb82078..b4cb11c0 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -48,7 +48,7 @@ package main;
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
-$version = 1.9;					# the version no of the software
+$version = "1.11";				# the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
  
 # handle disconnections
@@ -108,7 +108,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');
@@ -158,13 +164,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' || $sort eq 'O') {
 		$dxchan->start($line, $sort);  
-	} elsif ($sort eq 'D') {
+	} elsif ($sort eq 'I') {
 		die "\$user not defined for $call" if !defined $user;
 		
 		# normal input
@@ -173,6 +179,8 @@ 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";
 	}