possibly fix AGW connections to remove newline characters

[spider.git] / perl / AGWMsg.pm

diff --git a/perl/AGWMsg.pm b/perl/AGWMsg.pm
index 2e74da7be3005c48fd22b4cf2ed43121ec801436..08660d626d987ea7de5b036c9ca771bf06ccaaaa 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,6 +266,7 @@ sub _decode
                $data = '' unless defined $data;
                if ($sort eq 'D') {
                        my $d = unpack "Z*", $data;
+                       $d =~ s/\cJ//g;         # remove all new line characters
                        $d =~ s/\cM$//;
                        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);
@@ -289,11 +296,12 @@ 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/\cJ//g;         # remove all new line characters
                        $d =~ s/\cM$//;
                        my @lines = split /\cM/, $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') {