# This is where the cluster handles direct connections coming both in
# and out
#
-# $Id$
#
# Copyright (c) 2001 - Dirk Koopman G1TLH
#
my $conn = shift;
my $msg;
- if ($conn->{csort} eq 'ax25' && exists $conn->{msg}) {
+ if ($conn->ax25 && exists $conn->{msg}) {
$conn->{msg} =~ s/\cM/\cJ/g;
}
if ($conn->{state} eq 'WC') {
$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};
$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 {
delete $conn->{cmd};
$conn->{timeout}->del if $conn->{timeout};
delete $conn->{timeout};
- $conn->nolinger unless $conn->isa('AGWMsg');
+ $conn->{csort} = $sort;
+ unless ($conn->ax25) {
+ eval {$conn->{peerhost} = $conn->{sock}->peerhost};
+ $conn->nolinger;
+ }
&{$conn->{rproc}}($conn, "$dir$call|$sort");
$conn->_send_file("$main::data/connected") unless $conn->{outgoing};
}
$conn->conns($call);
$conn->{csort} = $f[1] if $f[1];
$conn->{state} = 'C';
+ eval {$conn->{peerhost} = $conn->{sock}->peerhost} unless $conn->ax25;
&{$conn->{rproc}}($conn, "O$call|$conn->{csort}");
delete $conn->{cmd};
$conn->{timeout}->del if $conn->{timeout};