1. I believe I have fixed all the login/logout 'broken pipe' errors

[spider.git] / perl / client.pl

diff --git a/perl/client.pl b/perl/client.pl
index db3bb80a1b720be88880cd3b5323c0d2e1e5410d..66c7b0927337d88443097fb62b2c1daa1cc5dce9 100755 (executable)
--- a/perl/client.pl
+++ b/perl/client.pl
@@ -46,16 +46,15 @@ use Net::Telnet qw(TELOPT_ECHO);
 use IO::File;
 use IO::Socket;
 use IPC::Open2;
-use Carp qw{cluck};
 
 # cease communications
 sub cease
 {
        my $sendz = shift;
-       if ($conn && $sendz) {
-               $conn->send_now("Z$call|bye...\n");
-               sleep(1);
-       }
+#      if ($conn && $sendz) {
+#              $conn->send_now("Z$call|bye...");
+#              sleep(1);
+#      }
        $stdout->flush if $stdout;
        if ($pid) {
                dbg('connect', "killing $pid");
@@ -100,15 +99,16 @@ sub rec_socket
 {
        my ($con, $msg, $err) = @_;
        if (defined $err && $err) {
-               cease(1);
+               cease(0);
        }
        if (defined $msg) {
-               my ($sort, $call, $line) = $msg =~ /^(\w)([A-Z0-9\-]+)\|(.*)$/;
+               my ($sort, $call, $line) = $msg =~ /^(\w)([^\|]+)\|(.*)$/;
                
                if ($sort eq 'D') {
                        my $snl = $mynl;
                        my $newsavenl = "";
                        $snl = "" if $mode == 0;
+                       $snl = "\r\n" if $mode == 2;
                        if ($mode == 2 && $line =~ />$/) {
                                $newsavenl = $snl;
                                $snl = ' ';
@@ -148,7 +148,15 @@ sub rec_socket
                        $buffered = $line;      # set buffered or unbuffered
                } elsif ($sort eq 'Z') { # end, disconnect, go, away .....
                        cease(0);
-               }         
+               } 
+
+               # ******************************************************
+               # ******************************************************
+               # any other sorts that might happen are silently ignored.
+               # ******************************************************
+               # ******************************************************
+       } else {
+               cease(0);
        }
        $lasttime = time; 
 }
@@ -172,8 +180,9 @@ sub rec_stdin
                cease(1);
        } elsif ($r > 0) {
                if ($mode) {
-                       $buf =~ s/\r/\n/og if $mode == 1;
-                       $buf =~ s/\r\n/\n/og if $mode == 2;
+                       $buf =~ s/\r/\n/g if $mode == 1;
+                       $buf =~ s/[\r\x00]//g if $mode == 2;
+                       
                        $dangle = !($buf =~ /\n$/);
                        if ($buf eq "\n") {
                                @lines = (" ");
@@ -268,16 +277,21 @@ sub dochat
                        if ($csort eq 'telnet') {
                                $line = $sock->get();
                                cease(11) unless $line;          # the socket has gone away?
-                               $line =~ s/\r\n/\n/og;
+                               if (length $line == 0) {
+                                       dbg('connect', "received 0 length line, aborting...");
+                                       cease(11);
+                               }
+                               $line =~ s/\r//g;
                                chomp;
                        } elsif ($csort eq 'ax25' || $csort eq 'prog') {
                                local $/ = "\r";
                                $line = <$rfh>;
-                               $line =~ s/\r//og;
-                       }
-                       if (length $line == 0) {
-                               dbg('connect', "received 0 length line, aborting...");
-                               cease(11);
+                               if (length $line == 0) {
+                                       dbg('connect', "received 0 length line, aborting...");
+                                       cease(11);
+                               }
+                               $line =~ s/\r/\n/g;
+                               chomp;
                        }
                        dbg('connect', "received \"$line\"");
                        if ($abort && $line =~ /$abort/i) {
@@ -304,6 +318,14 @@ sub timeout
        cease(0);
 }
 
+# handle callsign and connection type firtling
+sub doclient
+{
+       my $line = shift;
+       my @f = split /\s+/, $line;
+       $call = uc $f[0] if $f[0];
+       $csort = $f[1] if $f[1];
+}
 
 #
 # initialisation
@@ -358,7 +380,7 @@ $stdout->autoflush(1);
 
 $SIG{'INT'} = \&sig_term;
 $SIG{'TERM'} = \&sig_term;
-$SIG{'HUP'} = 'IGNORE';
+$SIG{'HUP'} = \&sig_term;
 $SIG{'CHLD'} = \&sig_chld;
 $SIG{'ALRM'} = \&timeout;
 
@@ -369,6 +391,9 @@ if ($loginreq) {
        my $user;
        my $s;
 
+       $connsort = 'telnet' if $connsort eq 'local';
+       setmode();
+
        if (-e "$data/issue") {
                open(I, "$data/issue") or die;
                local $/ = undef;
@@ -386,26 +411,20 @@ if ($loginreq) {
                
        $stdout->print('login: ');
        $stdout->flush();
-       local $\ = $nl;
+       local $\ = $mynl;
        $s = $stdin->getline();
        chomp $s;
        $s =~ s/\s+//og;
        $s =~ s/-\d+$//o;            # no ssids!
-       cease(0) unless $s gt ' ' && iscallsign($s);
+       cease(0) unless $s && $s gt ' ';
+       unless (iscallsign($s)) {
+               $stdout->print("Sorry, $s is an invalid callsign");
+               cease(0);
+       } 
        $call = uc $s;
-       $connsort = 'telnet' if $connsort eq 'local';
        alarm(0);
 }
 
-# handle callsign and connection type firtling
-sub doclient
-{
-       my $line = shift;
-       my @f = split /\s+/, $line;
-       $call = uc $f[0] if $f[0];
-       $csort = $f[1] if $f[1];
-}
-
 # is this an out going connection?
 if ($connsort eq "connect") {
        my $mcall = lc $call;
@@ -423,8 +442,8 @@ 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;
-               dochat($1, $2) if /\s*\'(.*)\'\s+\'(.*)\'/io;
-               if (/\s*cl\w+\s+(.*)/io) {
+               dochat($1, $2) if /^\s*\'(.*)\'\s+\'(.*)\'/io;
+               if (/^\s*cl\w+\s+(.*)/io) {
                        doclient($1);
                        last;
                }
@@ -461,6 +480,20 @@ if ($connsort eq "connect") {
 $mode = ($connsort eq 'ax25') ? 1 : 2;
 setmode();
 
+# adjust the callsign if it has an SSID, SSID <= 8 are legal > 8 are netrom connections
+my ($scall, $ssid) = split /-/, $call;
+$ssid = undef unless $ssid && $ssid =~ /^\d+$/;  
+if ($ssid) {
+       $ssid = 15 if $ssid > 15;
+       if ($connsort eq 'ax25') {
+               if ($ssid > 8) {
+                       $ssid = 15 - $ssid;
+               }
+       }
+       $call = "$scall-$ssid";
+}
+
+
 $conn = Msg->connect("$clusteraddr", $clusterport, \&rec_socket);
 if (! $conn) {
        if (-r "$data/offline") {