Change DXUser->get* to DXUser::get*

[spider.git] / perl / ExtMsg.pm

diff --git a/perl/ExtMsg.pm b/perl/ExtMsg.pm
index 07e740ac6385342d66f4c5a21817cb138fe57092..0ca2de83c6f5d367a67fbb4dc87d0267372b84f0 100644 (file)
--- a/perl/ExtMsg.pm
+++ b/perl/ExtMsg.pm
@@ -104,9 +104,9 @@ 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 ) {
+                                       if ($main::passwdreq || ($uref = DXUser::get_current($msg)) && $uref->passwd ) {
                                                $conn->conns($msg);
                                                $conn->{state} = 'WP';
                                                $conn->{decho} = $conn->{echo};
@@ -120,13 +120,13 @@ sub dequeue
                                        $conn->disconnect;
                                }
                        } elsif ($conn->{state} eq 'WP' ) {
-                               my $uref = DXUser->get_current($conn->{call});
+                               my $uref = DXUser::get_current($conn->{call});
                                $msg =~ s/[\r\n]+$//;
                                if ($uref && $msg eq $uref->passwd) {
                                        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 {
@@ -153,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};
 }