X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FExtMsg.pm;h=49982a18c9aafd9e2f54588cb7aad99c1172b7ac;hb=076b94b8ba5b24af929056d5e4c5217427f93b9e;hp=b39637d10e2af6f243eb580a6cbd814041ff24a1;hpb=2bbb601161d60a41289bd19b73fc35c24d5c6b71;p=spider.git

diff --git a/perl/ExtMsg.pm b/perl/ExtMsg.pm
index b39637d1..49982a18 100644
--- a/perl/ExtMsg.pm
+++ b/perl/ExtMsg.pm
@@ -19,7 +19,7 @@ use DXUtil;
 use DXDebug;
 use IO::File;
 use IO::Socket;
-use IPC::Open2;
+use IPC::Open3;
 
 use vars qw(@ISA $deftimeout);
 
@@ -70,7 +70,7 @@ 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} =~ /\cJ/) {
 		my @lines =  $conn->{msg} =~ /([^\cM\cJ]*)\cM?\cJ/g;
@@ -83,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;
@@ -99,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});
 					}
 				}
 			}
@@ -157,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;
 }
@@ -210,25 +211,58 @@ sub _doconnect
 		} else {
 			dbg('connect', "***Connect Failed to $host $port $!");
 		}
+	} elsif ($sort eq 'agw') {
+		# turn it into an AGW object
+		bless $conn, 'AGWMsg';
+		$r = $conn->connect($line);
 	} elsif ($sort eq 'ax25' || $sort eq 'prog') {
-		$conn->{sock} = new IO::File;
-		if ($conn->{sock}) {
-			my $outfd = fileno($conn->{sock});
-			my $out = new IO::File ">&$outfd";
-			if ($conn->{pid} = open2($conn->{sock}, $out, $line)) {
-				$conn->{csort} = $sort;
-				$conn->{lineend} = "\cM" if $sort eq 'ax25';
-				dbg('connect', "started $line");
+		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('connect', "can't start $line $!");
+				dbg('err', "cannot fork");	
+				$r = undef;
 			}
 		} else {
-			dbg('connect', "can't start $line $!");
+			dbg('err', "no socket pair $!");
 		}
 	} else {
 		dbg('err', "invalid type of connection ($sort)");
-		$conn->disconnect;
 	}
+	$conn->disconnect unless $r;
 	return $r;
 }
 
@@ -270,15 +304,15 @@ sub _dochat
 		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);
+				$conn->send_later("D$conn->{call}|$send");
 				delete $conn->{msg}; # get rid any input if a match
 				return;
 			}
@@ -307,7 +341,7 @@ sub _doclient
 	$conn->conns($call);
 	$conn->{csort} = $f[1] if $f[1];
 	$conn->{state} = 'C';
-	&{$conn->{rproc}}($conn, "O$call|telnet");
+	&{$conn->{rproc}}($conn, "O$call|$conn->{csort}");
 	delete $conn->{cmd};
 	$conn->{timeout}->del if $conn->{timeout};
 }