From f60995ebe3f29171582fbf3eb774b5add86cae18 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 29 Mar 2009 02:12:21 +0000
Subject: libipfix: add additional IEs for wprobe use
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15061 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
package/libipfix/extra/append-wprobe-ie.pl | 25 ++++++++++++++++---------
package/libipfix/extra/wprobe-ie.txt | 2 ++
package/libipfix/patches/110-wprobe_ie.patch | 7 ++++---
3 files changed, 22 insertions(+), 12 deletions(-)
(limited to 'package/libipfix')
diff --git a/package/libipfix/extra/append-wprobe-ie.pl b/package/libipfix/extra/append-wprobe-ie.pl
index e3a44f0d7..3a8db3fe1 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 3e5aeef30..26d64d213 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
diff --git a/package/libipfix/patches/110-wprobe_ie.patch b/package/libipfix/patches/110-wprobe_ie.patch
index 866b67a2f..bbfa33120 100644
--- a/package/libipfix/patches/110-wprobe_ie.patch
+++ b/package/libipfix/patches/110-wprobe_ie.patch
@@ -1,10 +1,9 @@
--- a/lib/ipfix_FOKUS_IEs.txt
+++ b/lib/ipfix_FOKUS_IEs.txt
-@@ -38,4 +38,39 @@
- 312, IPFIX_FT_OWDVARMEAN_NSEC, 4, IPFIX_CODING_INT, "owdvarmean_nsec", "FOKUS mean owd variace in ns"
+@@ -39,3 +39,41 @@
313, IPFIX_FT_OWDVARMIN_NSEC, 4, IPFIX_CODING_INT, "owdvarmin_nsec", "FOKUS minimum owd variance in ns"
314, IPFIX_FT_OWDVARMAX_NSEC, 4, IPFIX_CODING_INT, "owdvarmax_nsec", "FOKUS maximum ow variance in ns"
--
+
+315, IPFIX_FT_WPROBE_NOISE_AVG, 4, IPFIX_CODING_FLOAT, "global_noise_avg", "wprobe global noice floor - Average"
+316, IPFIX_FT_WPROBE_NOISE_STDEV, 4, IPFIX_CODING_FLOAT, "global_noise_stdev", "wprobe global noice floor - Standard deviation"
+317, IPFIX_FT_WPROBE_NOISE_N, 4, IPFIX_CODING_UINT, "global_noise_n", "wprobe global noice floor - Number of samples"
@@ -41,3 +40,5 @@
+348, IPFIX_FT_WPROBE_RETRANSMIT_1600_AVG, 4, IPFIX_CODING_FLOAT, "link_retransmit_1600_avg", "wprobe link total retransmissions per packet - >800 bytes - Average"
+349, IPFIX_FT_WPROBE_RETRANSMIT_1600_STDEV, 4, IPFIX_CODING_FLOAT, "link_retransmit_1600_stdev", "wprobe link total retransmissions per packet - >800 bytes - Standard deviation"
+350, IPFIX_FT_WPROBE_RETRANSMIT_1600_N, 4, IPFIX_CODING_UINT, "link_retransmit_1600_n", "wprobe link total retransmissions per packet - >800 bytes - Number of samples"
++351, IPFIX_FT_WPROBE_FRAMES, 4, IPFIX_CODING_UINT, "global_frames", "wprobe global number of 802.11 frames seen"
++352, IPFIX_FT_WPROBE_PROBEREQ, 4, IPFIX_CODING_UINT, "global_probereq", "wprobe global number of 802.11 probe requests seen"
--
cgit v1.2.3