X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=3ea1d6a52025fa1bb3ee65d975f61e3de6bbd96d;hb=5947a205b3f36462fc1fe5ed5a08c7d8293ab744;hp=8fa8acc2734c6faa82f5d5ca4cffbf3bd801b5d0;hpb=0b3e23be9f6feaf115d2faebeb95cd3dcf450a3c;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 8fa8acc2..3ea1d6a5 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -70,7 +70,7 @@ package main;
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
-$version = "1.36";				# the version no of the software
+$version = "1.40";				# 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
@@ -113,21 +113,21 @@ sub rec
 	# set up the basic channel info - this needs a bit more thought - there is duplication here
 	if (!defined $dxchan) {
 		my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
-
-                # is there one already connected to me ? 
+ 
+		# is there one already connected to me - locally? 
 		my $user = DXUser->get($call);
 		if (DXChannel->get($call)) {
-			my $mess = DXM::msg($lang, $user->sort eq 'A' ? 'concluster' : 'conother', $call);
+			my $mess = DXM::msg($lang, ($user && $user->sort eq 'A') ? 'concluster' : 'conother', $call);
 			already_conn($conn, $call, $mess);
 			return;
 		}
 		
-		# is there one already connected elsewhere in the cluster (and not a cluster)
+		# is there one already connected elsewhere in the cluster?
 		if ($user) {
 			if (($user->sort eq 'A' || $call eq $myalias) && !DXCluster->get_exact($call)) {
 				;
 			} else {
-				if (DXCluster->get($call) || DXChannel->get($call)) {
+				if (DXCluster->get_exact($call)) {
 					my $mess = DXM::msg($lang, $user->sort eq 'A' ? 'concluster' : 'conother', $call);
 					already_conn($conn, $call, $mess);
 					return;
@@ -135,7 +135,7 @@ sub rec
 			}
 			$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
 		} else {
-			if (DXCluster->get($call)) {
+			if (DXCluster->get_exact($call)) {
 				my $mess = DXM::msg($lang, 'conother', $call);
 				already_conn($conn, $call, $mess);
 				return;