X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FExtMsg.pm;h=6ea47a516b06f69d9a43f74681cb0b8423855a04;hb=15ee0303d77c205e68144dfd8d8a4e0110bbe5ea;hp=a601d4edfa01c0a09da64a74859e50ffdd9d94c6;hpb=2f1b948ea733e0ece1909a31987dc8f03044e851;p=spider.git

diff --git a/perl/ExtMsg.pm b/perl/ExtMsg.pm
index a601d4ed..6ea47a51 100644
--- a/perl/ExtMsg.pm
+++ b/perl/ExtMsg.pm
@@ -58,6 +58,9 @@ sub dequeue
 	my $conn = shift;
 	my $msg;
 
+	if ($conn->{sort} eq 'ax25' && exists $conn->{msg}) {
+		$conn->{msg} =~ s/\cM/\cJ/g;
+	}
 	if ($conn->{state} eq 'WC') {
 		if (exists $conn->{cmd}) {
 			if (@{$conn->{cmd}}) {
@@ -68,9 +71,9 @@ sub dequeue
 		if ($conn->{state} eq 'WC' && exists $conn->{cmd} && @{$conn->{cmd}} == 0) {
 			$conn->to_connected($conn->{call}, 'O', 'telnet');
 		}
-	} 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;
@@ -193,7 +196,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,7 +210,30 @@ sub _doconnect
 			dbg('connect', "***Connect Failed to $host $port $!");
 		}
 	} elsif ($sort eq 'ax25' || $sort eq 'prog') {
-		;
+		my $pid = fork();
+		if (defined $pid) {
+			if (!$pid) {
+				# in child, unset warnings, disable debugging and general clean up from us
+				$^W = 0;
+				eval "{ package DB; sub DB {} }";
+				DXChannel::closeall();
+				for (@main::listeners) {
+					$_->close_server;
+				}
+				unless ($^O =~ /^MS/) {
+					$SIG{HUP} = 'IGNORE';
+					$SIG{CHLD} = $SIG{TERM} = $SIG{INT} = $SIG{__WARN__} = 'DEFAULT';
+					alarm(0);
+				}
+				exec "$line" or dbg('cron', "exec '$line' failed $!");
+			}
+			dbg('connect', "program $sort $line started");
+			$conn->{pid} = $pid;
+			$conn->{sort} = $sort;
+			$conn->{lineend} = "\cM" if $sort eq 'ax25';
+		} else {
+			dbg('connect', "can't $sort fork for $line $!");
+		}
 	} else {
 		dbg('err', "invalid type of connection ($sort)");
 		$conn->disconnect;
@@ -247,7 +274,7 @@ sub _dochat
 	my $conn = shift;
 	my $cmd = shift;
 	my $line = shift;
-	
+		
 	if ($line) {
 		my ($expect, $send) = $cmd =~ /^\s*\'(.*)\'\s+\'(.*)\'/;
 		if ($expect) {
@@ -261,6 +288,7 @@ sub _dochat
 			if ($line =~ /$expect/i) {
 				dbg('connect', "got: \"$expect\" sending: \"$send\"");
 				$conn->send_later($send);
+				delete $conn->{msg}; # get rid any input if a match
 				return;
 			}
 		}