From: djk <djk>
Date: Mon, 30 Nov 1998 18:24:52 +0000 (+0000)
Subject: SSID appears to work!
X-Git-Tag: SPIDER_1_5~2
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=6ff342e3d9353dcb3094f600157a41abf678b212;p=spider.git

SSID appears to work!
---

diff --git a/cmd/set/node.pl b/cmd/set/node.pl
index fa0cf800..dd9e0a37 100644
--- a/cmd/set/node.pl
+++ b/cmd/set/node.pl
@@ -13,6 +13,7 @@ my @args = split /\s+/, $line;
 my $call;
 my @out;
 my $user;
+my $create;
 
 return (0) if $self->priv < 5;
 
@@ -23,10 +24,12 @@ foreach $call (@args) {
 	push @out, $self->msg('nodee1', $call);
   } else {
     $user = DXUser->get($call);
+	$create = !$user;
+	$user = DXUser->new($call) if $create;
 	if ($user) {
 	  $user->sort('A');
 	  $user->close();
-      push @out, $self->msg('node', $call);
+      push @out, $self->msg($create ? 'nodec' : 'node', $call);
 	} else {
       push @out, $self->msg('e3', "Set Node", $call);
 	}
diff --git a/perl/Messages b/perl/Messages
index aacef797..b8039a8f 100644
--- a/perl/Messages
+++ b/perl/Messages
@@ -36,6 +36,7 @@ package DXM;
 				l2 => 'Hello $_[0], this is $main::mycall in $main::myqth running DXSpider V$main::version',
 				m2 => '$_[0] Information: $_[1]',
 				node => '$_[0] set as AK1A style Node',
+				nodec => '$_[0] created as AK1A style Node',
 				nodee1 => 'You cannot use this command whilst your target ($_[0]) is on-line',
 				ok => 'Operation successful',
 				page => 'Press Enter to continue, A to abort ($_[0] lines) >',
diff --git a/perl/cluster.pl b/perl/cluster.pl
index f1b46732..c3f264bc 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -85,8 +85,11 @@ sub rec
 			return;
 		}
 		
-		# is there one already connected elsewhere in the cluster?
-		if (($call eq $main::myalias && DXCluster->get_exact($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");