changed the logic a bit so that the \r and \r\n are split upon

[spider.git] / perl / AGWMsg.pm

diff --git a/perl/AGWMsg.pm b/perl/AGWMsg.pm
index 2e74da7be3005c48fd22b4cf2ed43121ec801436..693f31085235cc6105301d403251e7fbceffe76f 100644 (file)
--- a/perl/AGWMsg.pm
+++ b/perl/AGWMsg.pm
@@ -44,6 +44,12 @@ $ypolltime = 10 unless defined $ypolltime;
 $hpolltime = 300 unless defined $hpolltime;
 %circuit = ();
 
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 sub init
 {
        return unless $enable;
@@ -260,7 +266,8 @@ sub _decode
                $data = '' unless defined $data;
                if ($sort eq 'D') {
                        my $d = unpack "Z*", $data;
-                       $d =~ s/\cM$//;
+                       $d =~ s/\cM\cJ?$//;
+                       $d =~ s/^\cJ//;
                        dbg("AGW Data In port: $port pid: $pid '$from'->'$to' length: $len \"$d\"") if isdbg('agw');
                        my $conn = _find($from eq $main::mycall ? $to : $from);
                        if ($conn) {
@@ -275,13 +282,10 @@ sub _decode
                                                $conn->to_connected($conn->{call}, 'O', $conn->{csort});
                                        }
                                } else {
-                                       my @lines = split /\cM/, $data;
-                                       if (@lines) {
-                                               for (@lines) {
-                                                       &{$conn->{rproc}}($conn, "I$conn->{call}|$_");
-                                               }
-                                       } else {
-                                               &{$conn->{rproc}}($conn, "I$conn->{call}|");
+                                       my @lines = split /\cM\cJ?/, $d;
+                                       push @lines, $d unless @lines;
+                                       for (@lines) {
+                                               &{$conn->{rproc}}($conn, "I$conn->{call}|$_");
                                        }
                                }
                        } else {
@@ -289,16 +293,17 @@ sub _decode
                        }
                } elsif ($sort eq 'I' || $sort eq 'S' || $sort eq 'U' || $sort eq 'M' || $sort eq 'T') {
                        my $d = unpack "Z*", $data;
-                       $d =~ s/\cM$//;
-                       my @lines = split /\cM/, $d;
+                       $d =~ s/^\cJ//;
+                       $d =~ s/\cM\cJ?$//;
+                       my @lines = split /\cM\cJ?/, $d;
                        
                        for (@lines) {
-                               s/([\x00-\x1f\x7f-\xff])/sprintf("%%%02X", ord($1))/eg; 
+#                              s/([\x00-\x1f\x7f-\xff])/sprintf("%%%02X", ord($1))/eg; 
                                dbg("AGW Monitor port: $port \"$_\"") if isdbg('agw');
                        }
                } elsif ($sort eq 'C') {
                        my $d = unpack "Z*", $data;
-                       $d =~ s/\cM$//;
+                       $d =~ s/\cM\cJ?$//;
                        dbg("AGW Connect port: $port pid: $pid '$from'->'$to' \"$d\"") if isdbg('agw');
                        my $call = $from eq $main::mycall ? $to : $from;
                        my $conn = _find($call);
@@ -333,7 +338,7 @@ sub _decode
                        }
                } elsif ($sort eq 'd') {
                        my $d = unpack "Z*", $data;
-                       $d =~ s/\cM$//;
+                       $d =~ s/\cM\cJ?$//;
                        dbg("AGW '$from'->'$to' port: $port Disconnected ($d)") if isdbg('agw');
                        my $conn = _find($from eq $main::mycall ? $to : $from);
                        if ($conn) {
@@ -353,7 +358,7 @@ sub _decode
                } elsif ($sort eq 'H') {
                        unless ($from =~ /^\s+$/) {
                                my $d = unpack "Z*", $data;
-                               $d =~ s/\cM$//;
+                               $d =~ s/\cM\cJ?$//;
                                dbg("AGW Heard port: $port \"$d\"") if isdbg('agw');
                        }
                } elsif ($sort eq 'X') {