fix a few typos
[spider.git] / perl / ExtMsg.pm
index 33c17bfd44bcc18bef606c60a221453989da6259..838c74e122460dfae490b6737727dec32590be99 100644 (file)
@@ -19,6 +19,7 @@ use DXUtil;
 use DXDebug;
 use IO::File;
 use IO::Socket;
+use IPC::Open3;
 
 use vars qw(@ISA $deftimeout);
 
@@ -29,12 +30,12 @@ sub enqueue
 {
        my ($conn, $msg) = @_;
        unless ($msg =~ /^[ABZ]/) {
-               if ($msg =~ /^E[-\w]+\|([01])/) {
+               if ($msg =~ /^E[-\w]+\|([01])/ && $conn->{csort} eq 'telnet') {
                        $conn->{echo} = $1;
                        if ($1) {
-                               $conn->send_raw("\xFF\xFC\x01");
+#                              $conn->send_raw("\xFF\xFC\x01");
                        } else {
-                               $conn->send_raw("\xFF\xFB\x01");
+#                              $conn->send_raw("\xFF\xFB\x01");
                        }
                } else {
                        $msg =~ s/^[-\w]+\|//;
@@ -57,57 +58,78 @@ sub dequeue
 {
        my $conn = shift;
        my $msg;
-       
-       while ($msg = shift @{$conn->{inqueue}}){
-               dbg('connect', $msg) unless $conn->{state} eq 'C';
-               
-               $msg =~ s/\xff\xfa.*\xff\xf0|\xff[\xf0-\xfe].//g; # remove telnet options
-               $msg =~ s/[\x00-\x08\x0a-\x1f\x80-\x9f]/./g;         # immutable CSI sequence + control characters
 
-               if ($conn->{state} eq 'C') {
-                       &{$conn->{rproc}}($conn, "I$conn->{call}|$msg", $!);
-                       $! = 0;
-               } elsif ($conn->{state} eq 'WL' ) {
-                       $msg = uc $msg;
-                       if (is_callsign($msg)) {
-                               _send_file($conn, "$main::data/connected");
-                               $conn->{call} = $msg;
-                               &{$conn->{rproc}}($conn, "A$conn->{call}|telnet");
-                               $conn->{state} = 'C';
-                       } else {
-                               $conn->send_now("Sorry $msg is an invalid callsign");
-                               $conn->disconnect;
-                       }
-               } elsif ($conn->{state} eq 'WC') {
-                       if (exists $conn->{cmd} && @{$conn->{cmd}}) {
-                               $conn->_docmd($msg);
-                               if ($conn->{state} eq 'WC' && exists $conn->{cmd} &&  @{$conn->{cmd}} == 0) {
-                                       $conn->{state} = 'C';
-                                       &{$conn->{rproc}}($conn, "O$conn->{call}|telnet");
-                                       delete $conn->{cmd};
-                                       $conn->{timeout}->del_timer if $conn->{timeout};
-                               }
-                       }
-               }
+       if ($conn->{csort} eq 'ax25' && exists $conn->{msg}) {
+               $conn->{msg} =~ s/\cM/\cJ/g;
        }
-       if ($conn->{msg} && $conn->{state} eq 'WC' && exists $conn->{cmd} && @{$conn->{cmd}}) {
-               $conn->_docmd($conn->{msg});
+       if ($conn->{state} eq 'WC') {
+               if (exists $conn->{cmd}) {
+                       if (@{$conn->{cmd}}) {
+                               dbg('connect', $conn->{msg});
+                               $conn->_docmd($conn->{msg});
+                       } 
+               }
                if ($conn->{state} eq 'WC' && exists $conn->{cmd} && @{$conn->{cmd}} == 0) {
-                       $conn->{state} = 'C';
-                       &{$conn->{rproc}}($conn, "O$conn->{call}|telnet");
-                       delete $conn->{cmd};
-                       $conn->{timeout}->del_timer if $conn->{timeout};
+                       $conn->to_connected($conn->{call}, 'O', $conn->{csort});
+               }
+       } elsif ($conn->{msg} =~ /\cJ/) {
+               my @lines =  $conn->{msg} =~ /([^\cM\cJ]*)\cM?\cJ/g;
+               if ($conn->{msg} =~ /\cJ$/) {
+                       delete $conn->{msg};
+               } else {
+                       $conn->{msg} = pop @lines;
+               }
+               while (defined ($msg = shift @lines)) {
+                       dbg('connect', $msg) unless $conn->{state} eq 'C';
+               
+                       $msg =~ s/\xff\xfa.*\xff\xf0|\xff[\xf0-\xfe].//g; # remove telnet options
+                       $msg =~ s/[\x00-\x08\x0a-\x19\x1b-\x1f\x80-\x9f]/./g;         # immutable CSI sequence + control characters
+                       
+                       if ($conn->{state} eq 'C') {
+                               &{$conn->{rproc}}($conn, "I$conn->{call}|$msg");
+                       } elsif ($conn->{state} eq 'WL' ) {
+                               $msg = uc $msg;
+                               if (is_callsign($msg)) {
+                                       $conn->to_connected($msg, 'A', $conn->{csort});
+                               } else {
+                                       $conn->send_now("Sorry $msg is an invalid callsign");
+                                       $conn->disconnect;
+                               }
+                       } elsif ($conn->{state} eq 'WC') {
+                               if (exists $conn->{cmd} && @{$conn->{cmd}}) {
+                                       $conn->_docmd($msg);
+                                       if ($conn->{state} eq 'WC' && exists $conn->{cmd} &&  @{$conn->{cmd}} == 0) {
+                                               $conn->to_connected($conn->{call}, 'O', $conn->{csort});
+                                       }
+                               }
+                       }
                }
        }
 }
 
+sub to_connected
+{
+       my ($conn, $call, $dir, $sort) = @_;
+       $conn->{state} = 'C';
+       $conn->conns($call);
+       delete $conn->{cmd};
+       $conn->{timeout}->del if $conn->{timeout};
+       delete $conn->{timeout};
+       $conn->_send_file("$main::data/connected");
+       &{$conn->{rproc}}($conn, "$dir$call|$sort");
+}
+
 sub new_client {
        my $server_conn = shift;
     my $sock = $server_conn->{sock}->accept();
     my $conn = $server_conn->new($server_conn->{rproc});
        $conn->{sock} = $sock;
 
-    my $rproc = &{$server_conn->{rproc}} ($conn, $sock->peerhost(), $sock->peerport());
+    my ($rproc, $eproc) = &{$server_conn->{rproc}} ($conn, $conn->{peerhost} = $sock->peerhost(), $conn->{peerport} = $sock->peerport());
+       if ($eproc) {
+               $conn->{eproc} = $eproc;
+        Msg::set_event_handler ($sock, "error" => $eproc);
+       }
     if ($rproc) {
         $conn->{rproc} = $rproc;
         my $callback = sub {$conn->_rcv};
@@ -116,9 +138,10 @@ sub new_client {
                $conn->{state} = 'WL';
 #              $conn->send_raw("\xff\xfe\x01\xff\xfc\x01\ff\fd\x22");
 #              $conn->send_raw("\xff\xfa\x22\x01\x01\xff\xf0");
-               $conn->send_raw("\xFF\xFC\x01");
-               _send_file($conn, "$main::data/issue");
-               $conn->send_raw("Login: ");
+#              $conn->send_raw("\xFF\xFC\x01");
+               $conn->_send_file("$main::data/issue");
+               $conn->send_raw("login: ");
+               $conn->_dotimeout(60);
     } else { 
         $conn->disconnect();
     }
@@ -128,13 +151,13 @@ sub start_connect
 {
        my $call = shift;
        my $fn = shift;
-       my $conn = ExtMsg->new(\&main::rec); 
-       $conn->{call} = $call;
+       my $conn = ExtMsg->new(\&main::new_channel); 
+       $conn->conns($call);
        
        my $f = new IO::File $fn;
        push @{$conn->{cmd}}, <$f>;
        $f->close;
-       push @main::outstanding_connects, {call => $call, conn => $conn};
+       $conn->{state} = 'WC';
        $conn->_dotimeout($deftimeout);
        $conn->_docmd;
 }
@@ -169,16 +192,14 @@ sub _docmd
                }
                last if $conn->{state} eq 'E';
        }
-       unless (exists $conn->{cmd} && @{$conn->{cmd}}) {
-               @main::outstanding_connects = grep {$_->{call} ne $conn->{call}} @main::outstanding_connects;
-       }
 }
 
 sub _doconnect
 {
        my ($conn, $sort, $line) = @_;
        my $r;
-       
+
+       $sort = lc $sort;
        dbg('connect', "CONNECT sort: $sort command: $line");
        if ($sort eq 'telnet') {
                # this is a straight network connect
@@ -191,11 +212,53 @@ sub _doconnect
                        dbg('connect', "***Connect Failed to $host $port $!");
                }
        } elsif ($sort eq 'ax25' || $sort eq 'prog') {
-               ;
+               local $^F = 10000;              # make sure it ain't closed on exec
+               my ($a, $b) = IO::Socket->socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC);
+               if ($a && $b) {
+                       $r = 1;
+                       $a->autoflush(1);
+                       $b->autoflush(1);
+                       my $pid = fork;
+                       if (defined $pid) {
+                               if ($pid) {
+                                       close $b;
+                                       $conn->{sock} = $a;
+                                       $conn->{csort} = $sort;
+                                       $conn->{lineend} = "\cM" if $sort eq 'ax25';
+                                       $conn->{pid} = $pid;
+                                       if ($conn->{rproc}) {
+                                               my $callback = sub {$conn->_rcv};
+                                               Msg::set_event_handler ($a, read => $callback);
+                                       }
+                                       dbg('connect', "started pid: $conn->{pid} as $line");
+                               } else {
+                                       $^W = 0;
+                                       dbgclose();
+                                       STDIN->close;
+                                       STDOUT->close;
+                                       STDOUT->close;
+                                       *STDIN = IO::File->new_from_fd($b, 'r') or die;
+                                       *STDOUT = IO::File->new_from_fd($b, 'w') or die;
+                                       *STDERR = IO::File->new_from_fd($b, 'w') or die;
+                                       close $a;
+                                       unless ($^O =~ /^MS/) {
+#                                              $SIG{HUP} = 'IGNORE';
+                                               $SIG{HUP} = $SIG{CHLD} = $SIG{TERM} = $SIG{INT} = 'DEFAULT';
+                                               alarm(0);
+                                       }
+                                       exec "$line" or dbg('err', "exec '$line' failed $!");
+                               } 
+                       } else {
+                               dbg('err', "cannot fork");      
+                               $r = undef;
+                       }
+               } else {
+                       dbg('err', "no socket pair $!");
+               }
        } else {
                dbg('err', "invalid type of connection ($sort)");
-               $conn->disconnect;
        }
+       $conn->disconnect unless $r;
        return $r;
 }
 
@@ -212,9 +275,9 @@ sub _dotimeout
        my $conn = shift;
        my $val = shift;
        dbg('connect', "timeout set to $val");
-       $conn->{timeout}->del_timer if $conn->{timeout};
-       $conn->{timeout} = ExtMsg->new_timer($val, sub{ _timeout($conn); });
+       $conn->{timeout}->del if $conn->{timeout};
        $conn->{timeval} = $val;
+       $conn->{timeout} = Timer->new($val, sub{ &_timedout($conn) });
 }
 
 sub _dolineend
@@ -232,20 +295,21 @@ sub _dochat
        my $conn = shift;
        my $cmd = shift;
        my $line = shift;
-       
+               
        if ($line) {
                my ($expect, $send) = $cmd =~ /^\s*\'(.*)\'\s+\'(.*)\'/;
                if ($expect) {
                        dbg('connect', "expecting: \"$expect\" received: \"$line\"");
-                       if ($conn->{abort} && $line =~ /$conn->{abort}/i) {
+                       if ($conn->{abort} && $line =~ /\Q$conn->{abort}/i) {
                                dbg('connect', "aborted on /$conn->{abort}/");
                                $conn->disconnect;
                                delete $conn->{cmd};
                                return;
                        }
-                       if ($line =~ /$expect/i) {
+                       if ($line =~ /\Q$expect/i) {
                                dbg('connect', "got: \"$expect\" sending: \"$send\"");
                                $conn->send_later($send);
+                               delete $conn->{msg}; # get rid any input if a match
                                return;
                        }
                }
@@ -254,12 +318,13 @@ sub _dochat
        unshift @{$conn->{cmd}}, $cmd;
 }
 
-sub _timeout
+sub _timedout
 {
        my $conn = shift;
        dbg('connect', "timed out after $conn->{timeval} seconds");
+       $conn->{timeout}->del;
+       delete $conn->{timeout};
        $conn->disconnect;
-       @main::outstanding_connects = grep {$_->{call} ne $conn->{call}} @main::outstanding_connects;
 }
 
 # handle callsign and connection type firtling
@@ -268,8 +333,13 @@ sub _doclient
        my $conn = shift;
        my $line = shift;
        my @f = split /\s+/, $line;
-       $conn->{call} = uc $f[0] if $f[0];
+       my $call = uc $f[0] if $f[0];
+       $conn->conns($call);
        $conn->{csort} = $f[1] if $f[1];
+       $conn->{state} = 'C';
+       &{$conn->{rproc}}($conn, "O$call|telnet");
+       delete $conn->{cmd};
+       $conn->{timeout}->del if $conn->{timeout};
 }
 
 sub _send_file
@@ -282,10 +352,9 @@ sub _send_file
                if ($f) {
                        while (<$f>) {
                                chomp;
-                               $conn->send_later($_);
+                               $conn->send_raw($_ . $conn->{lineend});
                        }
                        $f->close;
                }
        }
-       $! = undef;
 }