X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fclient.pl;h=459c26323a34480131247918043d9124649962dd;hb=ce2e3045bad021ba833c91dcc45b779a57752960;hp=9e948a181a64bee603208586c1573d65ddccf327;hpb=fade7a04893b2451b0dce2f51bffcd8b7f669a85;p=spider.git

diff --git a/perl/client.pl b/perl/client.pl
index 9e948a18..459c2632 100755
--- a/perl/client.pl
+++ b/perl/client.pl
@@ -41,10 +41,10 @@ BEGIN {
 use Msg;
 use DXVars;
 use DXDebug;
+use Net::Telnet qw(TELOPT_ECHO);
 use IO::File;
 use IO::Socket;
 use IPC::Open2;
-use Net::Telnet qw(TELOPT_ECHO);
 use Carp qw{cluck};
 
 # cease communications
@@ -98,7 +98,7 @@ sub rec_socket
 		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;
@@ -163,7 +163,9 @@ sub rec_stdin
 	#  $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;
@@ -189,9 +191,7 @@ sub rec_stdin
 		} else {
 			$conn->send_later("I$call|$buf");
 		}
-	} elsif ($r == 0) {
-		cease(1);
-	}
+	} 
 	$lasttime = time;
 }
 
@@ -209,12 +209,13 @@ sub doconnect
 		$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')
@@ -225,6 +226,8 @@ sub doconnect
 		$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 {
@@ -259,6 +262,7 @@ sub dochat
 		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') {
@@ -266,6 +270,10 @@ sub dochat
 				$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/");
@@ -325,9 +333,9 @@ $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';
@@ -489,7 +497,7 @@ Msg->set_event_handler($stdin, "read" => \&rec_stdin);
 
 for (;;) {
 	my $t;
-	Msg->event_loop(1, 0.010);
+	Msg->event_loop(1, 1);
 	$t = time;
 	if ($t > $lasttime) {
 		if ($outqueue) {