Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

collectd: snmp6 further improvements

Browse source 
Return with "-1" if parsing fails in read function.
Reduce buffersize of splitstring function.

Signed-off-by: Nick Hainke <vincent@systemli.org>
This commit is contained in:
Nick Hainke 2021-01-26 14:42:31 +01:00
parent 922e5b1a8b
commit 213c694b75
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
utils/collectd/patches/931-snmp6-add-ipv6-statistics.patch
View file

@ -155,7 +155,7 @@ Signed-off-by: Nick Hainke <vincent@systemli.org>
+int snmp_read(char *ifname) { +int snmp_read(char *ifname) {
+ FILE *fh; + FILE *fh;
+ char buffer[1024]; + char buffer[1024];
+ char *fields[16]; + char *fields[2];
+ int numfields; + int numfields;
+ int currline = 0; + int currline = 0;
+ derive_t data[76]; + derive_t data[76];
@ -178,17 +178,17 @@ Signed-off-by: Nick Hainke <vincent@systemli.org>
+ } + }
+ +
+ while (fgets(buffer, 1024, fh) != NULL) { + while (fgets(buffer, 1024, fh) != NULL) {
+ numfields = strsplit(buffer, fields, 16); + numfields = strsplit(buffer, fields, 2);
+ +
+ if (numfields < 2) + if (numfields < 2)
+ continue; + return -1;
+ +
+ data[currline++] = atoll(fields[1]); + data[currline++] = atoll(fields[1]);
+ } + }
+ +
+ fclose(fh); + fclose(fh);
+ +
+ if (currline < 25) { + if (currline < 28) {
+ return -1; + return -1;
+ } + }
+ +