add a basic wpxloc.dat translator

[spider.git] / perl / ExtMsg.pm

diff --git a/perl/ExtMsg.pm b/perl/ExtMsg.pm
index 15f875a7facf6f514d29785d4121a22f1c71b599..ae50f036568c57a02596f1d70b40c38260289876 100644 (file)
--- a/perl/ExtMsg.pm
+++ b/perl/ExtMsg.pm
@@ -5,7 +5,6 @@
 # This is where the cluster handles direct connections coming both in
 # and out
 #
-# $Id$
 #
 # Copyright (c) 2001 - Dirk Koopman G1TLH
 #
@@ -105,7 +104,7 @@ sub dequeue
                                $msg = uc $msg;
                                if (is_callsign($msg) && $msg !~ m|/| ) {
                                        my $sort = $conn->{csort};
-                                       $sort = 'local' if $conn->{peerhost} eq "127.0.0.1";
+                                       $sort = 'local' if $conn->{peerhost} =~ /127\.\d+\.\d+\.\d+$/ || $conn->{peerhost} eq '::1';
                                        my $uref;
                                        if ($main::passwdreq || ($uref = DXUser->get_current($msg)) && $uref->passwd ) {
                                                $conn->conns($msg);
@@ -127,7 +126,7 @@ sub dequeue
                                        my $sort = $conn->{csort};
                                        $conn->{echo} = $conn->{decho};
                                        delete $conn->{decho};
-                                       $sort = 'local' if $conn->{peerhost} eq "127.0.0.1";
+                                       $sort = 'local' if $conn->{peerhost} =~ /127\.\d+\.\d+\.\d+$/ || $conn->{peerhost} eq '::1';
                                        $conn->{usedpasswd} = 1;
                                        $conn->to_connected($conn->{call}, 'A', $sort);
                                } else {
@@ -154,7 +153,7 @@ sub to_connected
        delete $conn->{cmd};
        $conn->{timeout}->del if $conn->{timeout};
        delete $conn->{timeout};
-       $conn->nolinger unless $conn->isa('AGWMsg');
+       $conn->nolinger unless $conn->isa('AGWMsg') || $conn->isa('BPQMsg');
        &{$conn->{rproc}}($conn, "$dir$call|$sort");
        $conn->_send_file("$main::data/connected") unless $conn->{outgoing};
 }