X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=c3f264bc7d76b456491b21288fddce812693cce8;hb=6ff342e3d9353dcb3094f600157a41abf678b212;hp=d783bff33fa553deb411d410752bca80b51e87ef;hpb=cce345b95c555a0b45218c5b452bc0f5f4f13bab;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index d783bff3..c3f264bc 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;
@@ -84,8 +85,12 @@ sub rec
 			return;
 		}
 		
-		# is there one already connected elsewhere in the cluster?
-		if (DXCluster->get($call)) {
+		# is there one already connected elsewhere in the cluster (and not a cluster)
+		my $user = DXUser->get($call);
+		if ($user && $user->sort eq 'A' && !DXCluster->get_exact($call)) {
+			;
+		} elsif (($call eq $main::myalias && DXCluster->get_exact($call)) ||
+		    DXCluster->get($call)) {
 			my $mess = DXM::msg($lang, 'concluster', $call);
 			dbg('chan', "-> D $call $mess\n"); 
 			$conn->send_now("D$call|$mess");
@@ -95,6 +100,7 @@ sub rec
 			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);
@@ -149,7 +155,7 @@ sub process_inqueue
 	
 	my $data = $self->{data};
 	my $dxchan = $self->{dxchan};
-	my ($sort, $call, $line) = $data =~ /^(\w)(\w+)\|(.*)$/;
+	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");