# and out
#
#
-#
# Copyright (c) 2001 - Dirk Koopman G1TLH
#
+# Modified Jan 2006 by John Wiseman G8BPQ to support connections to BPQ32 node,
+# and fix pattern matching on 'chat' abort handling
+#
package ExtMsg;
$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;
+ $conn->nolinger unless $conn->isa('AGWMsg') || $conn->isa('BPQMsg');
&{$conn->{rproc}}($conn, "$dir$call|$sort");
$conn->_send_file("$main::data/connected") unless $conn->{outgoing};
}
# turn it into an AGW object
bless $conn, 'AGWMsg';
$r = $conn->connect($line);
+ } elsif ($sort eq 'bpq') {
+ # turn it into an BPQ object
+ bless $conn, 'BPQMsg';
+ $r = $conn->connect($line);
} elsif ($sort eq 'ax25' || $sort eq 'prog') {
$r = $conn->start_program($line, $sort);
} else {
if ($line) {
if ($expect) {
dbg("connect $conn->{cnum}: expecting: \"$expect\" received: \"$line\"") if isdbg('connect');
- if ($conn->{abort} && $line =~ /\Q$conn->{abort}/i) {
+ if ($conn->{abort} && $line =~ /$conn->{abort}/i) {
dbg("connect $conn->{cnum}: aborted on /$conn->{abort}/") if isdbg('connect');
$conn->disconnect;
delete $conn->{cmd};