fix a few typos

[spider.git] / perl / ExtMsg.pm

diff --git a/perl/ExtMsg.pm b/perl/ExtMsg.pm
index a601d4edfa01c0a09da64a74859e50ffdd9d94c6..838c74e122460dfae490b6737727dec32590be99 100644 (file)
--- a/perl/ExtMsg.pm
+++ b/perl/ExtMsg.pm
@@ -19,6 +19,7 @@ use DXUtil;
 use DXDebug;
 use IO::File;
 use IO::Socket;
+use IPC::Open3;
 
 use vars qw(@ISA $deftimeout);
 
@@ -58,6 +59,9 @@ sub dequeue
        my $conn = shift;
        my $msg;
 
+       if ($conn->{csort} eq 'ax25' && exists $conn->{msg}) {
+               $conn->{msg} =~ s/\cM/\cJ/g;
+       }
        if ($conn->{state} eq 'WC') {
                if (exists $conn->{cmd}) {
                        if (@{$conn->{cmd}}) {
@@ -66,11 +70,11 @@ sub dequeue
                        } 
                }
                if ($conn->{state} eq 'WC' && exists $conn->{cmd} && @{$conn->{cmd}} == 0) {
-                       $conn->to_connected($conn->{call}, 'O', 'telnet');
+                       $conn->to_connected($conn->{call}, 'O', $conn->{csort});
                }
-       } elsif ($conn->{msg} =~ /\n/) {
-               my @lines = split /\r?\n/, $conn->{msg};
-               if ($conn->{msg} =~ /\n$/) {
+       } 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;
@@ -79,14 +83,14 @@ sub dequeue
                        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
+                       $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', 'telnet');
+                                       $conn->to_connected($msg, 'A', $conn->{csort});
                                } else {
                                        $conn->send_now("Sorry $msg is an invalid callsign");
                                        $conn->disconnect;
@@ -95,7 +99,7 @@ sub dequeue
                                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', 'telnet');
+                                               $conn->to_connected($conn->{call}, 'O', $conn->{csort});
                                        }
                                }
                        }
@@ -153,6 +157,7 @@ sub start_connect
        my $f = new IO::File $fn;
        push @{$conn->{cmd}}, <$f>;
        $f->close;
+       $conn->{state} = 'WC';
        $conn->_dotimeout($deftimeout);
        $conn->_docmd;
 }
@@ -193,7 +198,8 @@ 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
@@ -206,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;
 }
 
@@ -247,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;
                        }
                }