diff options
Diffstat (limited to 'package/libipfix/extra')
| -rw-r--r-- | package/libipfix/extra/append-wprobe-ie.pl | 25 | ||||
| -rw-r--r-- | package/libipfix/extra/wprobe-ie.txt | 2 |
2 files changed, 18 insertions, 9 deletions
diff --git a/package/libipfix/extra/append-wprobe-ie.pl b/package/libipfix/extra/append-wprobe-ie.pl index e3a44f0d75..3a8db3fe1a 100644 --- a/package/libipfix/extra/append-wprobe-ie.pl +++ b/package/libipfix/extra/append-wprobe-ie.pl @@ -1,9 +1,9 @@ use strict; my @fields = ( - [ "avg", "FLOAT", "Average" ], - [ "stdev", "FLOAT", "Standard deviation" ], - [ "n", "UINT", "Number of samples" ] + [ "_avg", "FLOAT", " - Average" ], + [ "_stdev", "FLOAT", " - Standard deviation" ], + [ "_n", "UINT", " - Number of samples" ] ); my $file = $ARGV[0] or die "Syntax: $0 <file>\n"; @@ -16,17 +16,24 @@ while ($line = <IES>) { } close IES; while (<STDIN>) { - /^(\w+),\s*(\w+),\s*(.+)$/ and do { - my $rfield = $1; - my $nfield = $2; - my $descr = $3; - foreach my $f (@fields) { + /^(%?)(\w+),\s*(\w+),\s*(.+)$/ and do { + my $counter = $1; + my $rfield = $2; + my $nfield = $3; + my $descr = $4; + my @f; + if ($counter) { + @f = [ "", "UINT", "" ]; + } else { + @f = @fields; + } + foreach my $f (@f) { my $nr = ++$last_ie; my $n = $f->[0]; my $N = uc $n; my $ftype = $f->[1]; my $fdesc = $f->[2]; - print "$nr, IPFIX_FT_WPROBE_$rfield\_$N, 4, IPFIX_CODING_$ftype, \"$nfield\_$n\", \"$descr - $fdesc\"\n"; + print "$nr, IPFIX_FT_WPROBE_$rfield$N, 4, IPFIX_CODING_$ftype, \"$nfield$n\", \"$descr$fdesc\"\n"; } }; } diff --git a/package/libipfix/extra/wprobe-ie.txt b/package/libipfix/extra/wprobe-ie.txt index 3e5aeef304..26d64d2139 100644 --- a/package/libipfix/extra/wprobe-ie.txt +++ b/package/libipfix/extra/wprobe-ie.txt @@ -10,3 +10,5 @@ RETRANSMIT_200, link_retransmit_200, wprobe link total retransmissions per packe RETRANSMIT_400, link_retransmit_400, wprobe link total retransmissions per packet - <400 bytes RETRANSMIT_800, link_retransmit_800, wprobe link total retransmissions per packet - <800 bytes RETRANSMIT_1600, link_retransmit_1600, wprobe link total retransmissions per packet - >800 bytes +%FRAMES, global_frames, wprobe global number of 802.11 frames seen +%PROBEREQ, global_probereq, wprobe global number of 802.11 probe requests seen |