-#!/usr/bin/perl
+#!/usr/bin/perl -w
#
# A thing that implements dxcluster 'protocol'
#
use Msg;
use DXVars;
use DXDebug;
-use DXUser;
+use Net::Telnet qw(TELOPT_ECHO);
use IO::File;
use IO::Socket;
use IPC::Open2;
-use Net::Telnet qw(TELOPT_ECHO);
-use Carp;
+use Carp qw{cluck};
# cease communications
sub cease
dbg('connect', "killing $pid");
kill(9, $pid);
}
+ dbgclose();
+# $SIG{__WARN__} = sub {my $a = shift; cluck($a); };
sleep(1);
exit(0);
}
cease(1);
}
if (defined $msg) {
- my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
+ my ($sort, $call, $line) = $msg =~ /^(\w)([A-Z0-9\-]+)\|(.*)$/;
if ($sort eq 'D') {
my $snl = $mynl;
$line =~ s/\n/\r/og if $mode == 1;
#my $p = qq($line$snl);
if ($buffered) {
- if (length $outqueue >= 128) {
+ if (length $outqueue >= $client_buffer_lth) {
print $stdout $outqueue;
$outqueue = "";
}
$mode = $line; # set echo mode from cluster
my $term = POSIX::Termios->new;
$term->getattr(fileno($sock));
- $term->setflag( &POSIX::ISIG );
+ $term->setiflag( 0 );
+ $term->setoflag( 0 );
$term->setattr(fileno($sock), &POSIX::TCSANOW );
}
} elsif ($sort eq 'I') {
# $prbuf =~ s/\r/\\r/;
# $prbuf =~ s/\n/\\n/;
# print "sys: $r ($prbuf)\n";
- if ($r > 0) {
+ if (!defined $r || $r == 0) {
+ cease(1);
+ } elsif ($r > 0) {
if ($mode) {
$buf =~ s/\r/\n/og if $mode == 1;
$buf =~ s/\r\n/\n/og if $mode == 2;
} else {
$conn->send_later("I$call|$buf");
}
- } elsif ($r == 0) {
- cease(1);
- }
+ }
$lasttime = time;
}
$port = 23 if !$port;
# if ($port == 23) {
+
$sock = new Net::Telnet (Timeout => $timeout, Port => $port);
$sock->option_callback(\&optioncb);
$sock->output_record_separator('');
- $sock->option_log('option_log');
- $sock->dump_log('dump');
- $sock->option_accept(Wont => TELOPT_ECHO);
+# $sock->option_log('option_log');
+# $sock->dump_log('dump');
+ $sock->option_accept(Dont => TELOPT_ECHO, Wont => TELOPT_ECHO);
$sock->open($host) or die "Can't connect to $host port $port $!";
# } else {
# $sock = IO::Socket::INET->new(PeerAddr => "$host:$port", Proto => 'tcp')
$rfh = new IO::File;
$wfh = new IO::File;
$pid = open2($rfh, $wfh, "$line") or die "can't do $line $!";
+ die "no receive channel $!" unless $rfh;
+ die "no transmit channel $!" unless $wfh;
dbg('connect', "got pid $pid");
$wfh->autoflush(1);
} else {
for (;;) {
if ($csort eq 'telnet') {
$line = $sock->get();
+ cease(11) unless $line; # the socket has gone away?
$line =~ s/\r\n/\n/og;
chomp;
} elsif ($csort eq 'ax25' || $csort eq 'prog') {
$mode = 2; # 1 - \n = \r as EOL, 2 - \n = \n, 0 - transparent
$call = ""; # the callsign being used
-@stdoutq = (); # the queue of stuff to send out to the user
$conn = 0; # the connection object for the cluster
$lastbit = ""; # the last bit of an incomplete input line
$mynl = "\n"; # standard terminator
$lasttime = time; # lasttime something happened on the interface
-$outqueue = ""; # the output queue length
+$outqueue = ""; # the output queue
+$client_buffer_lth = 200; # how many characters are buffered up on outqueue
$buffered = 1; # buffer output
$savenl = ""; # an NL that has been saved from last time
$timeout = 60; # default timeout for connects
$rfh = 0;
$wfh = 0;
+$waitedpid = 0;
#
# deal with args
#
-$call = uc shift @ARGV;
+$call = uc shift @ARGV if @ARGV;
$call = uc $myalias if !$call;
-$connsort = lc shift @ARGV;
+$connsort = lc shift @ARGV if @ARGV;
$connsort = 'local' if !$connsort;
$loginreq = $call eq 'LOGIN';
$SIG{'TERM'} = \&sig_term;
$SIG{'HUP'} = 'IGNORE';
$SIG{'CHLD'} = \&sig_chld;
+$SIG{'ALRM'} = \&timeout;
dbgadd('connect');
close(I);
$issue = s/\n/\r/og if $mode == 1;
local $/ = $nl;
- $stdout->print($issue) if issue;
+ $stdout->print($issue) if $issue;
}
+ use DXUser;
+
DXUser->init($userfn);
# allow a login from an existing user. I could create a user but
open(IN, "$cpath/$mcall") or cease(2);
@in = <IN>;
close IN;
-
+
alarm($timeout);
for (@in) {
# close W;
$stdin = $rfh;
$stdout = $wfh;
- $csort = 'telnet' if $sort eq 'prog';
+ $csort = 'telnet' if $csort eq 'prog';
} elsif ($csort eq 'telnet') {
# open(STDIN, "<&$sock");
# open(STDOUT, ">&$sock");
open IN, "$data/offline" or die;
while (<IN>) {
s/\n/\r/og if $mode == 1;
- print $stdout;
+ print $stdout $_;
}
close IN;
} else {