X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Flibipfix%2Fextra%2Fappend-wprobe-ie.pl;h=3a8db3fe1a155747e79436d868477424f554e585;hb=cadbb5f37cbf5a6e1ba01563a5ab64a6610318a3;hp=e3a44f0d753fba62586e5ee0a7fe91d96d75bb10;hpb=cb62f7dffdd435a7d090bec44ec7be4ac3fd194b;p=openwrt-10.03%2F.git

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";
 		}
 	};
 }