even betterer

diff --git a/perl/Messages b/perl/Messages
index 2a42e71e7c52e06482f34714062a8d5343ccc9c2..8b555dfa27ab06d551b77add5c5c49a974a38b57 100644 (file)
--- a/perl/Messages
+++ b/perl/Messages
@@ -22,8 +22,8 @@ package DXM;
                                beepoff => 'Beeps are now off',
                                beepon => 'Beeps are now on',
                                call1 => 'Callsign lookup via $_[0]:',
-                               conother => 'Sorry $_[0] you are connected on another port',
-                               concluster => 'Sorry $_[0] you are already connected elsewhere on the cluster',
+                               conother => 'Sorry $_[0] you are connected on another port here',
+                               concluster => 'Sorry $_[0] you are already connected elsewhere on the cluster ($_[1])',
                                conscript => 'no connect script called \"$_[0]\" found in $main::root/connect',
                                confail => 'connection to $_[0] failed ($_[1])',
                                constart => 'connection to $_[0] started',

diff --git a/perl/cluster.pl b/perl/cluster.pl
index d34a3337b270cf27a1c912e2a17594f1047ed77e..50e860d29d57899df6289f50b4036e2f1b14f911 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -129,7 +129,7 @@ sub rec
                # is there one already connected to me - locally? 
                my $user = DXUser->get($call);
                if (DXChannel->get($call)) {
-                       my $mess = DXM::msg($lang, ($user && $user->is_node) ? 'concluster' : 'conother', $call);
+                       my $mess = DXM::msg($lang, ($user && $user->is_node) ? 'concluster' : 'conother', $call, $main::mycall);
                        already_conn($conn, $call, $mess);
                        return;
                }
@@ -139,16 +139,16 @@ sub rec
                        if (($user->is_node || $call eq $myalias) && !DXCluster->get_exact($call)) {
                                ;
                        } else {
-                               if (DXCluster->get_exact($call)) {
-                                       my $mess = DXM::msg($lang, $user->is_node ? 'concluster' : 'conother', $call);
+                               if (my $ref = DXCluster->get_exact($call)) {
+                                       my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->call);
                                        already_conn($conn, $call, $mess);
                                        return;
                                }
                        }
                        $user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
                } else {
-                       if (DXCluster->get_exact($call)) {
-                               my $mess = DXM::msg($lang, 'conother', $call);
+                       if (my $ref = DXCluster->get_exact($call)) {
+                               my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->call);
                                already_conn($conn, $call, $mess);
                                return;
                        }
@@ -159,6 +159,7 @@ sub rec
                if ($user->lockout) {
                        Log('DXCommand', "$call is locked out, disconnected");
                        $conn->send_now("Z$call|bye"); # this will cause 'client' to disconnect
+                       $conn->disconect;
                        return;
                }