X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Flibipfix%2Fextra%2Fappend-wprobe-ie.pl;h=8bb658bbb9521c979d520de5cf9198cdf2f876d0;hb=413f57040dc4173929e3257226b07a32d1111c0d;hp=e3a44f0d753fba62586e5ee0a7fe91d96d75bb10;hpb=cb62f7dffdd435a7d090bec44ec7be4ac3fd194b;p=openwrt.git

diff --git a/package/libipfix/extra/append-wprobe-ie.pl b/package/libipfix/extra/append-wprobe-ie.pl
index e3a44f0d75..8bb658bbb9 100644
--- a/package/libipfix/extra/append-wprobe-ie.pl
+++ b/package/libipfix/extra/append-wprobe-ie.pl
@@ -1,33 +1,38 @@
 use strict;
 
 my @fields = (
-	[ "avg", "FLOAT", "Average" ],
-	[ "stdev", "FLOAT", "Standard deviation" ],
-	[ "n", "UINT", "Number of samples" ]
+	[ "_n", "UINT", " - Number of samples", 4 ],
+	[ "_s", "UINT", " - Sum of samples", 8 ],
+	[ "_ss", "UINT", " - Sum of squared samples", 8 ],
 );
 
-my $file = $ARGV[0] or die "Syntax: $0 <file>\n";
+my $file = $ARGV[0] or die "Syntax: $0 <file> <start>\n";
 -f $file or die "File not found\n";
-my $last_ie = 0;
-my $line;
-open IES, "<$file" or die "Can't open file";
-while ($line = <IES>) {
-	$line =~ /^(\d+)\s*,/ and $last_ie = $1;
-}
-close IES;
-while (<STDIN>) {
-	/^(\w+),\s*(\w+),\s*(.+)$/ and do {
-		my $rfield = $1;
-		my $nfield = $2;
-		my $descr = $3;
-		foreach my $f (@fields) {
-			my $nr = ++$last_ie;
+my $start = $ARGV[1];
+$start =~ /^\d+$/ or die "Invalid start number";
+open FILE, "<$file" or die "Can't open file";
+while (<FILE>) {
+	/^(%?)(\w+),\s*(\w+),\s*(.+)$/ and do {
+		my $counter = $1;
+		my $rfield = $2;
+		my $nfield = $3;
+		my $descr = $4;
+		my @f;
+		if ($counter) {
+			@f = [ "", "UINT", "", 4];
+		} else {
+			@f = @fields;
+		}
+		foreach my $f (@f) {
+			my $nr = $start++;
 			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";
+			my $size = $f->[3];
+			print "$nr, IPFIX_FT_WPROBE_$rfield$N, $size, IPFIX_CODING_$ftype, \"$nfield$n\", \"$descr$fdesc\"\n";
 		}
 	};
 }
+close FILE;