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') {
my $sort = $conn->{csort};
$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};
delete $conn->{cmd};
$conn->{timeout}->del if $conn->{timeout};
delete $conn->{timeout};
- $conn->nolinger unless $conn->isa('AGWMsg') || $conn->isa('BPQMsg');
+ $conn->{csort} = $sort;
+ $conn->nolinger unless $conn->ax25;
&{$conn->{rproc}}($conn, "$dir$call|$sort");
$conn->_send_file("$main::data/connected") unless $conn->{outgoing};
}