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

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 73cb401a..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
@@ -48,7 +50,7 @@ package main;
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
-$version = "1.12";				# 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
@@ -89,34 +91,25 @@ sub rec
 		# 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)) {
+			if (($user->sort eq 'A' || $call eq $myalias) && !DXCluster->get_exact($call)) {
 				;
 			} else {
-				if (DXChannel->get($call)) {
+				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 (DXChannel->get($call)) {
+			if (DXCluster->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);
-		} else {
-			$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");
@@ -149,7 +142,7 @@ 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);
@@ -252,15 +245,17 @@ 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);