X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FExtMsg.pm;h=b39637d10e2af6f243eb580a6cbd814041ff24a1;hb=a711fc132a7e18e67def6abeba3f8d18bbaae72f;hp=a601d4edfa01c0a09da64a74859e50ffdd9d94c6;hpb=2f1b948ea733e0ece1909a31987dc8f03044e851;p=spider.git

diff --git a/perl/ExtMsg.pm b/perl/ExtMsg.pm
index a601d4ed..b39637d1 100644
--- a/perl/ExtMsg.pm
+++ b/perl/ExtMsg.pm
@@ -19,6 +19,7 @@ use DXUtil;
 use DXDebug;
 use IO::File;
 use IO::Socket;
+use IPC::Open2;
 
 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}}) {
@@ -68,9 +72,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 +197,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 +211,20 @@ sub _doconnect
 			dbg('connect', "***Connect Failed to $host $port $!");
 		}
 	} 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");
+			} else {
+				dbg('connect', "can't start $line $!");
+			}
+		} else {
+			dbg('connect', "can't start $line $!");
+		}
 	} else {
 		dbg('err', "invalid type of connection ($sort)");
 		$conn->disconnect;
@@ -247,7 +265,7 @@ sub _dochat
 	my $conn = shift;
 	my $cmd = shift;
 	my $line = shift;
-	
+		
 	if ($line) {
 		my ($expect, $send) = $cmd =~ /^\s*\'(.*)\'\s+\'(.*)\'/;
 		if ($expect) {
@@ -261,6 +279,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;
 			}
 		}