*** empty log message ***

[spider.git] / perl / client.pl

diff --git a/perl/client.pl b/perl/client.pl
index 1b6757b48c27c09c63ea7f19f1a4167a50c014d8..47e05463a08fc4dc4ed13ce287a7759fbbe08732 100755 (executable)
--- a/perl/client.pl
+++ b/perl/client.pl
@@ -42,7 +42,7 @@ use Msg;
 use DXVars;
 use DXDebug;
 use DXUtil;
-use Net::Telnet qw(TELOPT_ECHO);
+use Net::Telnet qw(TELOPT_ECHO TELOPT_BINARY);
 use IO::File;
 use IO::Socket;
 use IPC::Open2;
@@ -51,10 +51,10 @@ use IPC::Open2;
 sub cease
 {
        my $sendz = shift;
-       if ($conn && $sendz) {
-               $conn->send_now("Z$call|bye...");
-               sleep(1);
-       }
+#      if ($conn && $sendz) {
+#              $conn->send_now("Z$call|bye...");
+#              sleep(1);
+#      }
        $stdout->flush if $stdout;
        if ($pid) {
                dbg('connect', "killing $pid");
@@ -99,7 +99,7 @@ sub rec_socket
 {
        my ($con, $msg, $err) = @_;
        if (defined $err && $err) {
-               cease(1);
+               cease(0);
        }
        if (defined $msg) {
                my ($sort, $call, $line) = $msg =~ /^(\w)([^\|]+)\|(.*)$/;
@@ -108,7 +108,8 @@ sub rec_socket
                        my $snl = $mynl;
                        my $newsavenl = "";
                        $snl = "" if $mode == 0;
-                       $snl = "\r\n" if $mode == 2;
+                       $snl = "\r\n" if $mode == 3;
+                       $snl = "\n" if $mode == 2;
                        if ($mode == 2 && $line =~ />$/) {
                                $newsavenl = $snl;
                                $snl = ' ';
@@ -155,6 +156,8 @@ sub rec_socket
                # any other sorts that might happen are silently ignored.
                # ******************************************************
                # ******************************************************
+       } else {
+               cease(0);
        }
        $lasttime = time; 
 }
@@ -220,19 +223,13 @@ sub doconnect
                my ($host, $port) = split /\s+/, $line;
                $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(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')
-#                              or die "Can't connect to $host port $port $!";
-#              }
+               $sock = new Net::Telnet (Timeout => $timeout, Port => $port);
+               $sock->option_callback(\&optioncb);
+               $sock->output_record_separator('');
+               $sock->option_accept(Dont => TELOPT_ECHO, Wont => TELOPT_ECHO);
+               $sock->open($host) or die "Can't connect to $host port $port $!";
+               $sock->binmode(1);
+               $mode = ($port == 23) ? 2 : 3;
        } elsif ($sort eq 'ax25' || $sort eq 'prog') {
                my @args = split /\s+/, $line;
                $rfh = new IO::File;
@@ -242,6 +239,7 @@ sub doconnect
                die "no transmit channel $!" unless $wfh;
                dbg('connect', "got pid $pid");
                $wfh->autoflush(1);
+               $mode = 1;
        } else {
                die "invalid type of connection ($sort)";
        }
@@ -470,12 +468,12 @@ if ($connsort eq "connect") {
     $outbound = 1;
        $connsort = $csort;
        $stdout->autoflush(1);
+       $mode = ($connsort eq 'ax25') ? 1 : $mode;
        close STDIN;
        close STDOUT;
        close STDERR;
 }
 
-$mode = ($connsort eq 'ax25') ? 1 : 2;
 setmode();
 
 # adjust the callsign if it has an SSID, SSID <= 8 are legal > 8 are netrom connections