From d82b0041541c4b91a85cdbd845bb984e85a885c7 Mon Sep 17 00:00:00 2001 From: maralvira Date: Mon, 17 Jan 2011 15:47:08 +0000 Subject: [PATCH] fix parsing and pcap generation for packets with multiple output lines (those that are > 16 bytes). --- cpu/mc1322x/tools/rftestrx2pcap.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cpu/mc1322x/tools/rftestrx2pcap.pl b/cpu/mc1322x/tools/rftestrx2pcap.pl index 2bf58a657..b10c19d09 100755 --- a/cpu/mc1322x/tools/rftestrx2pcap.pl +++ b/cpu/mc1322x/tools/rftestrx2pcap.pl @@ -59,13 +59,13 @@ while(1) { #new packet ($sec, $usec) = gettimeofday; print STDERR "rftestline: $sec $usec $str"; - } elsif($str =~ /^\s*data/) { + } elsif($str =~ /^\w+/) { #packet payload print STDERR "dataline: "; print STDERR $str; - $str =~ /data: 0x\d+ (.+)/; + chomp $str; + $str =~ /(.+)/; my @data = split(' ',$1); - ($len, @data) = @data; #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";