SSID appears to work!

diff --git a/cmd/set/node.pl b/cmd/set/node.pl
index fa0cf8007509b0f96cecff1784ab3796bc301ef7..dd9e0a372d0bc54605631f6e955bec24d4e4a821 100644 (file)
--- 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 aacef797e60d20bb90c96cef91b7ef498c7852a7..b8039a8f10dd002ead46ee419b3ea091f1a012e8 100644 (file)
--- 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 f1b467321219f222df82efaaffd7dabb8722165c..c3f264bc7d76b456491b21288fddce812693cce8 100755 (executable)
--- 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");