added a not found message to sh/qrz

[spider.git] / perl / client.pl

diff --git a/perl/client.pl b/perl/client.pl
index ff2ca473f82b03451e0f023d7d72d3ee6e9adc5b..ddf3fd3ba6adba52f6ed6f19ccab464d613dbd05 100755 (executable)
--- a/perl/client.pl
+++ b/perl/client.pl
@@ -88,10 +88,13 @@ sub setmode
 {
        if ($mode == 1) {
                $mynl = "\r";
+               $out_lineend = "\r";
        } else {
                $mynl = "\n";
+               $out_lineend = "\r\n";
        }
        $/ = $mynl;
+       $out_lineend = $mynl;
 }
 
 # handle incoming messages
@@ -119,7 +122,7 @@ sub rec_socket
                        if ($buffered) {
                                if (length $outqueue >= $client_buffer_lth) {
                                        print $stdout $outqueue;
-                                       pop @echo if @echo > $maxecho;
+                                       pop @echo while (@echo > $maxecho);
                                        push @echo, $outqueue;
                                        $outqueue = "";
                                }
@@ -146,7 +149,7 @@ sub rec_socket
                } elsif ($sort eq 'B') {
                        if ($buffered && $outqueue) {
                                print $stdout $outqueue;
-                               pop @echo if @echo > $maxecho;
+                               pop @echo while(@echo > $maxecho);
                                push @echo, $outqueue;
                                $outqueue = "";
                        }
@@ -233,7 +236,13 @@ sub doconnect
                $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);
+               if ($port == 23) {
+                       $sock->telnetmode(1);
+                       $sock->option_send(Dont => TELOPT_ECHO, Wont => TELOPT_ECHO) if $port == 23;
+               } else {
+                       $sock->telnetmode(0);
+               }
+               $sock->binmode(0);
                $mode = 3;
        } elsif ($sort eq 'ax25' || $sort eq 'prog') {
                my @args = split /\s+/, $line;
@@ -265,6 +274,16 @@ sub dotimeout
        $timeout = $val;
 }
 
+sub dolineend
+{
+       my $val = shift;
+       $out_lineend = $val;
+       $out_lineend =~ s/\\r/\r/g;
+       $out_lineend =~ s/\\n/\n/g;
+       dbg('connect', "lineend set to $val ");
+       $out_lineend = $mynl unless $out_lineend;
+}
+
 sub dochat
 {
        my ($expect, $send) = @_;
@@ -304,9 +323,10 @@ sub dochat
        }
        if ($send) {
                if ($csort eq 'telnet') {
+#                      local $\ = $out_lineend;
                        $sock->print("$send\n");
                } elsif ($csort eq 'ax25') {
-                       local $\ = "\r";
+                       local $\ = $out_lineend;
                        $wfh->print("$send");
                }
                dbg('connect', "sent \"$send\"");
@@ -350,6 +370,7 @@ $maxecho = 5;                  # length of max echo queue
 $pid = 0;                       # the pid of the child program
 $csort = "";                    # the connection type
 $sock = 0;                      # connection socket
+$out_lineend = $mynl;          # connection lineending (used for outgoing connects) 
 
 $stdin = *STDIN;
 $stdout = *STDOUT;
@@ -419,7 +440,7 @@ if ($loginreq) {
        $s =~ s/\s+//og;
        $s =~ s/-\d+$//o;            # no ssids!
        cease(0) unless $s && $s gt ' ';
-       unless (iscallsign($s)) {
+       unless (is_callsign($s)) {
                $stdout->print("Sorry, $s is an invalid callsign");
                cease(0);
        } 
@@ -444,7 +465,9 @@ if ($connsort eq "connect") {
                doconnect($1, $2) if /^\s*co\w*\s+(\w+)\s+(.*)$/io;
                doabort($1) if /^\s*a\w*\s+(.*)/io;
                dotimeout($1) if /^\s*t\w*\s+(\d+)/io;
+               dolineend($1) if /^\s*[Ll]\w*\s+\'((?:\\[rn])+)\'/;
                dochat($1, $2) if /^\s*\'(.*)\'\s+\'(.*)\'/io;
+               
                if (/^\s*cl\w+\s+(.*)/io) {
                        doclient($1);
                        last;