projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
get set/nobeeps to work?
[spider.git]
/
perl
/
client.pl
diff --git
a/perl/client.pl
b/perl/client.pl
index 1a57a1c6e983bb229d283fe4f040ff0aee9e3c2a..9f39fdd135c42e22cc1a2249528e06edfaf6fdb4 100755
(executable)
--- a/
perl/client.pl
+++ b/
perl/client.pl
@@
-41,10
+41,10
@@
BEGIN {
use Msg;
use DXVars;
use DXDebug;
use Msg;
use DXVars;
use DXDebug;
+use Net::Telnet qw(TELOPT_ECHO);
use IO::File;
use IO::Socket;
use IPC::Open2;
use IO::File;
use IO::Socket;
use IPC::Open2;
-use Net::Telnet qw(TELOPT_ECHO);
use Carp qw{cluck};
# cease communications
use Carp qw{cluck};
# cease communications
@@
-53,6
+53,7
@@
sub cease
my $sendz = shift;
if ($conn && $sendz) {
$conn->send_now("Z$call|bye...\n");
my $sendz = shift;
if ($conn && $sendz) {
$conn->send_now("Z$call|bye...\n");
+ sleep(1);
}
$stdout->flush if $stdout;
if ($pid) {
}
$stdout->flush if $stdout;
if ($pid) {
@@
-62,6
+63,9
@@
sub cease
dbgclose();
# $SIG{__WARN__} = sub {my $a = shift; cluck($a); };
sleep(1);
dbgclose();
# $SIG{__WARN__} = sub {my $a = shift; cluck($a); };
sleep(1);
+
+ # do we need this ?
+ $conn->disconnect if $conn;
exit(0);
}
exit(0);
}
@@
-98,7
+102,7
@@
sub rec_socket
cease(1);
}
if (defined $msg) {
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;
if ($sort eq 'D') {
my $snl = $mynl;
@@
-163,7
+167,9
@@
sub rec_stdin
# $prbuf =~ s/\r/\\r/;
# $prbuf =~ s/\n/\\n/;
# print "sys: $r ($prbuf)\n";
# $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;
if ($mode) {
$buf =~ s/\r/\n/og if $mode == 1;
$buf =~ s/\r\n/\n/og if $mode == 2;
@@
-189,9
+195,7
@@
sub rec_stdin
} else {
$conn->send_later("I$call|$buf");
}
} else {
$conn->send_later("I$call|$buf");
}
- } elsif ($r == 0) {
- cease(1);
- }
+ }
$lasttime = time;
}
$lasttime = time;
}
@@
-209,12
+213,13
@@
sub doconnect
$port = 23 if !$port;
# if ($port == 23) {
$port = 23 if !$port;
# if ($port == 23) {
+
$sock = new Net::Telnet (Timeout => $timeout, Port => $port);
$sock->option_callback(\&optioncb);
$sock->output_record_separator('');
$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')
$sock->open($host) or die "Can't connect to $host port $port $!";
# } else {
# $sock = IO::Socket::INET->new(PeerAddr => "$host:$port", Proto => 'tcp')
@@
-225,6
+230,8
@@
sub doconnect
$rfh = new IO::File;
$wfh = new IO::File;
$pid = open2($rfh, $wfh, "$line") or die "can't do $line $!";
$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 {
dbg('connect', "got pid $pid");
$wfh->autoflush(1);
} else {
@@
-259,6
+266,7
@@
sub dochat
for (;;) {
if ($csort eq 'telnet') {
$line = $sock->get();
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') {
$line =~ s/\r\n/\n/og;
chomp;
} elsif ($csort eq 'ax25' || $csort eq 'prog') {
@@
-266,6
+274,10
@@
sub dochat
$line = <$rfh>;
$line =~ s/\r//og;
}
$line = <$rfh>;
$line =~ s/\r//og;
}
+ if (length $line == 0) {
+ dbg('connect', "received 0 length line, aborting...");
+ cease(11);
+ }
dbg('connect', "received \"$line\"");
if ($abort && $line =~ /$abort/i) {
dbg('connect', "aborted on /$abort/");
dbg('connect', "received \"$line\"");
if ($abort && $line =~ /$abort/i) {
dbg('connect', "aborted on /$abort/");
@@
-489,7
+501,7
@@
Msg->set_event_handler($stdin, "read" => \&rec_stdin);
for (;;) {
my $t;
for (;;) {
my $t;
- Msg->event_loop(1,
0.010
);
+ Msg->event_loop(1,
1
);
$t = time;
if ($t > $lasttime) {
if ($outqueue) {
$t = time;
if ($t > $lasttime) {
if ($outqueue) {