tidied up login: changes in client.pl

[spider.git] / perl / client.pl

diff --git a/perl/client.pl b/perl/client.pl
index ffae6e584ebfbc5fc4c5fa44ef7f929cbe031bc9..84ab5d530ee7e770636299302306469c2ad3dc18 100755 (executable)
--- a/perl/client.pl
+++ b/perl/client.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
 #
 # A thing that implements dxcluster 'protocol'
 #
@@ -41,12 +41,12 @@ BEGIN {
 use Msg;
 use DXVars;
 use DXDebug;
-use DXUser;
+use DXUtil;
+use Net::Telnet qw(TELOPT_ECHO);
 use IO::File;
 use IO::Socket;
 use IPC::Open2;
-use Net::Telnet qw(TELOPT_ECHO);
-use Carp;
+use Carp qw{cluck};
 
 # cease communications
 sub cease
@@ -54,13 +54,19 @@ sub cease
        my $sendz = shift;
        if ($conn && $sendz) {
                $conn->send_now("Z$call|bye...\n");
+               sleep(1);
        }
        $stdout->flush if $stdout;
        if ($pid) {
                dbg('connect', "killing $pid");
                kill(9, $pid);
        }
+       dbgclose();
+#      $SIG{__WARN__} = sub {my $a = shift; cluck($a); };
        sleep(1);
+
+       # do we need this ?
+       $conn->disconnect if $conn;
        exit(0);        
 }
 
@@ -97,7 +103,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;
@@ -128,7 +134,8 @@ sub rec_socket
                                $mode = $line;          # set echo mode from cluster
                                my $term = POSIX::Termios->new;
                                $term->getattr(fileno($sock));
-                               $term->setflag( &POSIX::ISIG );
+                               $term->setiflag( 0 );
+                               $term->setoflag( 0 );
                                $term->setattr(fileno($sock), &POSIX::TCSANOW );
                        }
                } elsif ($sort eq 'I') {
@@ -161,7 +168,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;
@@ -187,9 +196,7 @@ sub rec_stdin
                } else {
                        $conn->send_later("I$call|$buf");
                }
-       } elsif ($r == 0) {
-               cease(1);
-       }
+       } 
        $lasttime = time;
 }
 
@@ -207,12 +214,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')
@@ -223,6 +231,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 {
@@ -257,6 +267,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') {
@@ -264,6 +275,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/");
@@ -323,9 +338,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';
@@ -354,6 +369,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;
@@ -364,40 +382,25 @@ if ($loginreq) {
                $stdout->print($issue) if $issue;
        }
        
-
-       DXUser->init($userfn);
-       
        # allow a login from an existing user. I could create a user but
        # I want to check for valid callsigns and I don't have the 
        # necessary info / regular expression yet
-       for ($state = 0; $state < 2; ) {
-               alarm($timeout);
+       alarm($timeout);
                
-               if ($state == 0) {
-                       $stdout->print('login: ');
-                       $stdout->flush();
-                       local $\ = $nl;
-                       $s = $stdin->getline();
-                       chomp $s;
-                       $s =~ s/\s+//og;
-                       $s =~ s/-\d+$//o;            # no ssids!
-                       cease(0) unless $s gt ' ';
-                       $call = uc $s;
-                       $user = DXUser->get($call);
-                       $state = 1;
-               } elsif ($state == 1) {
-                       $stdout->print('password: ');
-                       $stdout->flush();
-                       local $\ = $nl;
-                       $s = $stdin->getline();
-                       chomp $s;
-                       $state = 2;
-                       if (!$user || ($user->passwd && $user->passwd ne $s)) {
-                               $stdout->print("sorry...$nl");
-                               cease(0);
-                       }
-               }
-       }
+       $stdout->print('login: ');
+       $stdout->flush();
+       local $\ = $mynl;
+       $s = $stdin->getline();
+       chomp $s;
+       $s =~ s/\s+//og;
+       $s =~ s/-\d+$//o;            # no ssids!
+       cease(0) unless $s && $s gt ' ';
+       unless (iscallsign($s)) {
+               $stdout->print("Sorry, $s is an invalid callsign");
+               cease(0);
+       } 
+       $call = uc $s;
+       alarm(0);
 }
 
 # handle callsign and connection type firtling
@@ -470,7 +473,7 @@ if (! $conn) {
                open IN, "$data/offline" or die;
                while (<IN>) {
                        s/\n/\r/og if $mode == 1;
-                       print $stdout;
+                       print $stdout $_;
                }
                close IN;
        } else {
@@ -485,7 +488,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) {