From 400ea36fce4ffad822df9380b6de3ae1b08c7fba Mon Sep 17 00:00:00 2001 From: Mariano Alvira Date: Mon, 22 Jun 2009 16:23:36 -0400 Subject: [PATCH] final rftest2pcap script Signed-off-by: Mariano Alvira --- rftestrx2pcap.pl | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/rftestrx2pcap.pl b/rftestrx2pcap.pl index 73917be9a..2bf58a657 100755 --- a/rftestrx2pcap.pl +++ b/rftestrx2pcap.pl @@ -53,28 +53,32 @@ while(1) { if (defined($count) && ($count != 0)) { $str .= $c; # match if ends in \n or \r and process line - if(($str =~ /\n\r$/) || - ($str =~ /\r\n$/)) { + if(($str =~ /\n$/) || + ($str =~ /\r$/)) { if($str =~ /^rftest/) { #new packet ($sec, $usec) = gettimeofday; -# print "rftestline: $sec $usec $str\n\r"; + print STDERR "rftestline: $sec $usec $str"; } elsif($str =~ /^\s*data/) { #packet payload + print STDERR "dataline: "; + print STDERR $str; $str =~ /data: 0x\d+ (.+)/; my @data = split(' ',$1); -# print "dataline: "; ($len, @data) = @data; -# print "\n\r"; #write out pcap entry print pack('LLLL',($sec,$usec,scalar(@data),scalar(@data)+2)); + print STDERR "new packet: $sec $usec " . scalar(@data) . " " . (scalar(@data)+2) . "\n\r"; @frame = @data[0,1]; - print pack ('CC',($frame[1],$frame[0])); + print pack ('CC',(hex($frame[0]),hex($frame[1]))); + print STDERR "$frame[0] $frame[1] "; foreach my $data (@data[2..scalar(@data)-1]) { print pack ('C',hex($data)); + print STDERR "$data "; } + print STDERR "\n\r"; } - + print STDERR "\n\r"; $str = ''; } }