{
my ($conn, $msg) = @_;
unless ($msg =~ /^[ABZ]/) {
- if ($msg =~ /^E[-\w]+\|([01])/ && $conn->{csort} eq 'telnet') {
+ if ($msg =~ m{^E[-\w\/]+\|([01])} && $conn->{csort} eq 'telnet') {
$conn->{echo} = $1;
if ($1) {
# $conn->send_raw("\xFF\xFC\x01");
# $conn->send_raw("\xFF\xFB\x01");
}
} else {
- $msg =~ s/^[-\w]+\|//;
+ $msg =~ s{^[-\w\/]+\|}{};
push (@{$conn->{outqueue}}, $msg . $conn->{lineend});
}
}
&{$conn->{rproc}}($conn, "I$conn->{call}|$msg");
} elsif ($conn->{state} eq 'WL' ) {
$msg = uc $msg;
- if (is_callsign($msg) && $msg !~ m|/| ) {
- 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 ) {
- $conn->conns($msg);
- $conn->{state} = 'WP';
- $conn->{decho} = $conn->{echo};
- $conn->{echo} = 0;
- $conn->send_raw('password: ');
+ if (is_callsign($msg)) {
+ if ($main::allowslashcall || $msg !~ m|/|) {
+ 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 ) {
+ $conn->conns($msg);
+ $conn->{state} = 'WP';
+ $conn->{decho} = $conn->{echo};
+ $conn->{echo} = 0;
+ $conn->send_raw('password: ');
+ } else {
+ $conn->to_connected($msg, 'A', $sort);
+ }
} else {
- $conn->to_connected($msg, 'A', $sort);
+ $conn->send_now("Sorry $msg is an invalid callsign");
+ $conn->disconnect;
}
} else {
$conn->send_now("Sorry $msg is an invalid callsign");
delete $conn->{timeout};
$conn->{csort} = $sort;
&{$conn->{rproc}}($conn, "$dir$call|$sort");
- $conn->_send_file("$main::data/connected") unless $conn->{outgoing};
+ $conn->_send_file(localdata("connected")) unless $conn->{outgoing};
}
sub new_client {
my $conn = $server_conn->SUPER::new_client($client);
# send login prompt
$conn->{state} = 'WL';
- $conn->_send_file("$main::data/issue");
+ $conn->_send_file(localdata("issue"));
$conn->send_raw("login: ");
$conn->_dotimeout(60);
$conn->{echo} = 1;
$conn->conns($call);
$conn->{csort} = $f[1] if $f[1];
$conn->{state} = 'C';
- eval {$conn->{peerhost} = $conn->{sock}->peerhost} unless $conn->ax25;
+ eval {$conn->{peerhost} = $conn->{sock}->handle->peerhost} unless $conn->ax25;
&{$conn->{rproc}}($conn, "O$call|$conn->{csort}");
delete $conn->{cmd};
$conn->{timeout}->del if $conn->{timeout};