aboutsummaryrefslogtreecommitdiffstats
path: root/package/libipfix/extra
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-12-19 22:19:34 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-12-19 22:19:34 +0000
commit3d012f654ebc210d22310aa32d4d1e2946beed5c (patch)
tree04302e817f4a6fd7b5f324ea07a2f72bc1f51e05 /package/libipfix/extra
parent36422504da9128ee65183cc9a8b4e94dc252a5c2 (diff)
downloadmaster-187ad058-3d012f654ebc210d22310aa32d4d1e2946beed5c.tar.gz
master-187ad058-3d012f654ebc210d22310aa32d4d1e2946beed5c.tar.bz2
master-187ad058-3d012f654ebc210d22310aa32d4d1e2946beed5c.zip
libipfix: specify the number of the wprobe ie append script on the command line
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18855 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/libipfix/extra')
-rw-r--r--package/libipfix/extra/append-wprobe-ie.pl17
1 files changed, 7 insertions, 10 deletions
diff --git a/package/libipfix/extra/append-wprobe-ie.pl b/package/libipfix/extra/append-wprobe-ie.pl
index fa838ff76a..8bb658bbb9 100644
--- a/package/libipfix/extra/append-wprobe-ie.pl
+++ b/package/libipfix/extra/append-wprobe-ie.pl
@@ -6,16 +6,12 @@ my @fields = (
[ "_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>) {
+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;
@@ -28,7 +24,7 @@ while (<STDIN>) {
@f = @fields;
}
foreach my $f (@f) {
- my $nr = ++$last_ie;
+ my $nr = $start++;
my $n = $f->[0];
my $N = uc $n;
my $ftype = $f->[1];
@@ -38,4 +34,5 @@ while (<STDIN>) {
}
};
}
+close FILE;