# This is where the cluster handles direct connections coming both in
# and out
#
-# $Id$
#
# 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;
use DXDebug;
use IO::File;
use IO::Socket;
+use IPC::Open3;
use vars qw(@ISA $deftimeout);
@ISA = qw(Msg);
$deftimeout = 60;
+sub login
+{
+ goto &main::login; # save some writing, this was the default
+}
+
sub enqueue
{
my ($conn, $msg) = @_;
my $sock = $conn->{sock};
return unless defined($sock);
push (@{$conn->{outqueue}}, $msg);
- dbg('connect', $msg) unless $conn->{state} eq 'C';
+ dbg("connect $conn->{cnum}: $msg") if $conn->{state} ne 'C' && isdbg('connect');
Msg::set_event_handler ($sock, "write" => sub {$conn->_send(0)});
}
+sub echo
+{
+ my $conn = shift;
+ $conn->{echo} = shift;
+}
+
sub dequeue
{
my $conn = shift;
my $msg;
- if ($conn->{sort} eq 'ax25' && exists $conn->{msg}) {
+ if ($conn->{csort} eq 'ax25' && exists $conn->{msg}) {
$conn->{msg} =~ s/\cM/\cJ/g;
}
if ($conn->{state} eq 'WC') {
if (exists $conn->{cmd}) {
if (@{$conn->{cmd}}) {
- dbg('connect', $conn->{msg});
+ dbg("connect $conn->{cnum}: $conn->{msg}") if isdbg('connect');
$conn->_docmd($conn->{msg});
}
}
if ($conn->{state} eq 'WC' && exists $conn->{cmd} && @{$conn->{cmd}} == 0) {
- $conn->to_connected($conn->{call}, 'O', 'telnet');
+ $conn->to_connected($conn->{call}, 'O', $conn->{csort});
}
} elsif ($conn->{msg} =~ /\cJ/) {
my @lines = $conn->{msg} =~ /([^\cM\cJ]*)\cM?\cJ/g;
if ($conn->{msg} =~ /\cJ$/) {
delete $conn->{msg};
} else {
- $conn->{msg} = pop @lines;
+ $conn->{msg} =~ s/([^\cM\cJ]*)\cM?\cJ//g;
}
while (defined ($msg = shift @lines)) {
- dbg('connect', $msg) unless $conn->{state} eq 'C';
+ dbg("connect $conn->{cnum}: $msg") if $conn->{state} ne 'C' && isdbg('connect');
$msg =~ s/\xff\xfa.*\xff\xf0|\xff[\xf0-\xfe].//g; # remove telnet options
- $msg =~ s/[\x00-\x08\x0a-\x1f\x80-\x9f]/./g; # immutable CSI sequence + control characters
+# $msg =~ s/[\x00-\x08\x0a-\x19\x1b-\x1f\x80-\x9f]/./g; # immutable CSI sequence + control characters
if ($conn->{state} eq 'C') {
&{$conn->{rproc}}($conn, "I$conn->{call}|$msg");
} elsif ($conn->{state} eq 'WL' ) {
$msg = uc $msg;
- if (is_callsign($msg)) {
- $conn->to_connected($msg, 'A', 'telnet');
+ 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: ');
+ } else {
+ $conn->to_connected($msg, 'A', $sort);
+ }
} else {
$conn->send_now("Sorry $msg is an invalid callsign");
$conn->disconnect;
}
+ } elsif ($conn->{state} eq 'WP' ) {
+ 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} =~ /127\.\d+\.\d+\.\d+$/ || $conn->{peerhost} eq '::1';
+ $conn->{usedpasswd} = 1;
+ $conn->to_connected($conn->{call}, 'A', $sort);
+ } else {
+ $conn->send_now("Sorry");
+ $conn->disconnect;
+ }
} elsif ($conn->{state} eq 'WC') {
if (exists $conn->{cmd} && @{$conn->{cmd}}) {
$conn->_docmd($msg);
if ($conn->{state} eq 'WC' && exists $conn->{cmd} && @{$conn->{cmd}} == 0) {
- $conn->to_connected($conn->{call}, 'O', 'telnet');
+ $conn->to_connected($conn->{call}, 'O', $conn->{csort});
}
}
}
delete $conn->{cmd};
$conn->{timeout}->del if $conn->{timeout};
delete $conn->{timeout};
- $conn->_send_file("$main::data/connected");
+ $conn->nolinger unless $conn->isa('AGWMsg') || $conn->isa('BPQMsg');
&{$conn->{rproc}}($conn, "$dir$call|$sort");
+ $conn->_send_file("$main::data/connected") unless $conn->{outgoing};
}
sub new_client {
my $server_conn = shift;
my $sock = $server_conn->{sock}->accept();
- my $conn = $server_conn->new($server_conn->{rproc});
- $conn->{sock} = $sock;
-
- my ($rproc, $eproc) = &{$server_conn->{rproc}} ($conn, $conn->{peerhost} = $sock->peerhost(), $conn->{peerport} = $sock->peerport());
- if ($eproc) {
- $conn->{eproc} = $eproc;
- Msg::set_event_handler ($sock, "error" => $eproc);
+ if ($sock) {
+ my $conn = $server_conn->new($server_conn->{rproc});
+ $conn->{sock} = $sock;
+ $conn->nolinger;
+ Msg::blocking($sock, 0);
+ $conn->{blocking} = 0;
+ eval {$conn->{peerhost} = $sock->peerhost};
+ if ($@) {
+ dbg($@) if isdbg('connll');
+ $conn->disconnect;
+ } else {
+ eval {$conn->{peerport} = $sock->peerport};
+ $conn->{peerport} = 0 if $@;
+ my ($rproc, $eproc) = &{$server_conn->{rproc}} ($conn, $conn->{peerhost}, $conn->{peerport});
+ dbg("accept $conn->{cnum} from $conn->{peerhost} $conn->{peerport}") if isdbg('connll');
+ if ($eproc) {
+ $conn->{eproc} = $eproc;
+ Msg::set_event_handler ($sock, "error" => $eproc);
+ }
+ if ($rproc) {
+ $conn->{rproc} = $rproc;
+ my $callback = sub {$conn->_rcv};
+ Msg::set_event_handler ($sock, "read" => $callback);
+ # send login prompt
+ $conn->{state} = 'WL';
+ # $conn->send_raw("\xff\xfe\x01\xff\xfc\x01\ff\fd\x22");
+ # $conn->send_raw("\xff\xfa\x22\x01\x01\xff\xf0");
+ # $conn->send_raw("\xFF\xFC\x01");
+ $conn->_send_file("$main::data/issue");
+ $conn->send_raw("login: ");
+ $conn->_dotimeout(60);
+ $conn->{echo} = 1;
+ } else {
+ &{$conn->{eproc}}() if $conn->{eproc};
+ $conn->disconnect();
+ }
+ }
+ } else {
+ dbg("ExtMsg: error on accept ($!)") if isdbg('err');
}
- if ($rproc) {
- $conn->{rproc} = $rproc;
- my $callback = sub {$conn->_rcv};
- Msg::set_event_handler ($sock, "read" => $callback);
- # send login prompt
- $conn->{state} = 'WL';
-# $conn->send_raw("\xff\xfe\x01\xff\xfc\x01\ff\fd\x22");
-# $conn->send_raw("\xff\xfa\x22\x01\x01\xff\xf0");
-# $conn->send_raw("\xFF\xFC\x01");
- $conn->_send_file("$main::data/issue");
- $conn->send_raw("login: ");
- $conn->_dotimeout(60);
- } else {
- $conn->disconnect();
- }
}
sub start_connect
my $call = shift;
my $fn = shift;
my $conn = ExtMsg->new(\&main::new_channel);
+ $conn->{outgoing} = 1;
$conn->conns($call);
my $f = new IO::File $fn;
push @{$conn->{cmd}}, <$f>;
$f->close;
+ $conn->{state} = 'WC';
$conn->_dotimeout($deftimeout);
$conn->_docmd;
}
last;
}
}
- if ($cmd =~ /^\s*\'.*\'\s+\'.*\'/i) {
- $conn->_dochat($cmd, $msg);
+ if ($cmd =~ /^\s*\'([^\']*)\'\s+\'([^\']*)\'/) {
+ $conn->_dochat($cmd, $msg, $1, $2);
last;
}
if ($cmd =~ /^\s*cl\w+\s+(.*)/i) {
my $r;
$sort = lc $sort;
- dbg('connect', "CONNECT sort: $sort command: $line");
+ dbg("CONNECT $conn->{cnum} sort: $sort command: $line") if isdbg('connect');
if ($sort eq 'telnet') {
# this is a straight network connect
my ($host, $port) = split /\s+/, $line;
$port = 23 if !$port;
$r = $conn->connect($host, $port);
if ($r) {
- dbg('connect', "Connected to $host $port");
+ dbg("Connected $conn->{cnum} to $host $port") if isdbg('connect');
} else {
- dbg('connect', "***Connect Failed to $host $port $!");
+ dbg("***Connect $conn->{cnum} Failed to $host $port $!") if isdbg('connect');
}
+ } elsif ($sort eq 'agw') {
+ # 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') {
- my $pid = fork();
- if (defined $pid) {
- if (!$pid) {
- # in child, unset warnings, disable debugging and general clean up from us
- $^W = 0;
- eval "{ package DB; sub DB {} }";
- DXChannel::closeall();
- for (@main::listeners) {
- $_->close_server;
- }
- unless ($^O =~ /^MS/) {
- $SIG{HUP} = 'IGNORE';
- $SIG{CHLD} = $SIG{TERM} = $SIG{INT} = $SIG{__WARN__} = 'DEFAULT';
- alarm(0);
- }
- exec "$line" or dbg('cron', "exec '$line' failed $!");
- }
- dbg('connect', "program $sort $line started");
- $conn->{pid} = $pid;
- $conn->{sort} = $sort;
- $conn->{lineend} = "\cM" if $sort eq 'ax25';
- } else {
- dbg('connect', "can't $sort fork for $line $!");
- }
+ $r = $conn->start_program($line, $sort);
} else {
- dbg('err', "invalid type of connection ($sort)");
- $conn->disconnect;
+ dbg("invalid type of connection ($sort)");
}
+ $conn->disconnect unless $r;
return $r;
}
{
my $conn = shift;
my $string = shift;
- dbg('connect', "abort $string");
+ dbg("connect $conn->{cnum}: abort $string") if isdbg('connect');
$conn->{abort} = $string;
}
{
my $conn = shift;
my $val = shift;
- dbg('connect', "timeout set to $val");
+ dbg("connect $conn->{cnum}: timeout set to $val") if isdbg('connect');
$conn->{timeout}->del if $conn->{timeout};
$conn->{timeval} = $val;
$conn->{timeout} = Timer->new($val, sub{ &_timedout($conn) });
{
my $conn = shift;
my $val = shift;
- dbg('connect', "lineend set to $val ");
+ dbg("connect $conn->{cnum}: lineend set to $val ") if isdbg('connect');
$val =~ s/\\r/\r/g;
$val =~ s/\\n/\n/g;
$conn->{lineend} = $val;
my $conn = shift;
my $cmd = shift;
my $line = shift;
+ my $expect = shift;
+ my $send = shift;
if ($line) {
- my ($expect, $send) = $cmd =~ /^\s*\'(.*)\'\s+\'(.*)\'/;
if ($expect) {
- dbg('connect', "expecting: \"$expect\" received: \"$line\"");
+ dbg("connect $conn->{cnum}: expecting: \"$expect\" received: \"$line\"") if isdbg('connect');
if ($conn->{abort} && $line =~ /$conn->{abort}/i) {
- dbg('connect', "aborted on /$conn->{abort}/");
+ dbg("connect $conn->{cnum}: aborted on /$conn->{abort}/") if isdbg('connect');
$conn->disconnect;
delete $conn->{cmd};
return;
}
- if ($line =~ /$expect/i) {
- dbg('connect', "got: \"$expect\" sending: \"$send\"");
- $conn->send_later($send);
+ if ($line =~ /\Q$expect/i) {
+ if (length $send) {
+ dbg("connect $conn->{cnum}: got: \"$expect\" sending: \"$send\"") if isdbg('connect');
+ $conn->send_later("D$conn->{call}|$send");
+ }
delete $conn->{msg}; # get rid any input if a match
return;
}
sub _timedout
{
my $conn = shift;
- dbg('connect', "timed out after $conn->{timeval} seconds");
- $conn->{timeout}->del;
- delete $conn->{timeout};
+ dbg("connect $conn->{cnum}: timed out after $conn->{timeval} seconds") if isdbg('connect');
$conn->disconnect;
}
$conn->conns($call);
$conn->{csort} = $f[1] if $f[1];
$conn->{state} = 'C';
- &{$conn->{rproc}}($conn, "O$call|telnet");
+ &{$conn->{rproc}}($conn, "O$call|$conn->{csort}");
delete $conn->{cmd};
$conn->{timeout}->del if $conn->{timeout};
}
if ($f) {
while (<$f>) {
chomp;
- $conn->send_raw($_ . $conn->{lineend});
+ my $l = $_;
+ dbg("connect $conn->{cnum}: $l") if isdbg('connll');
+ $conn->send_raw($l . $conn->{lineend});
}
$f->close;
}
projects / spider.git / blobdiff