From 922e5b1a8bde4bddca2b0f4eb680a9bf1532db77 Mon Sep 17 00:00:00 2001
From: Nick Hainke <vincent@systemli.org>
Date: Mon, 25 Jan 2021 21:22:19 +0100
Subject: [PATCH 1/2] collectd: fix snmp6 not showing all interfaces

Getifaddrs() is not working all the time (e.g. wireguard interfaces).
Instead we use if_nameindex() syscall as suggested in:
 https://stackoverflow.com/a/45796495/8474618

Signed-off-by: Nick Hainke <vincent@systemli.org>
---
 utils/collectd/Makefile                       |  2 +-
 .../931-snmp6-add-ipv6-statistics.patch       | 22 ++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile
index 2fedf5980..c9d6019f9 100644
--- a/utils/collectd/Makefile
+++ b/utils/collectd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=collectd
 PKG_VERSION:=5.12.0
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://collectd.org/files/ \
diff --git a/utils/collectd/patches/931-snmp6-add-ipv6-statistics.patch b/utils/collectd/patches/931-snmp6-add-ipv6-statistics.patch
index 213801ba6..8f50b0fe6 100644
--- a/utils/collectd/patches/931-snmp6-add-ipv6-statistics.patch
+++ b/utils/collectd/patches/931-snmp6-add-ipv6-statistics.patch
@@ -90,7 +90,7 @@ Signed-off-by: Nick Hainke <vincent@systemli.org>
  #  Port "8125"
 --- /dev/null
 +++ b/src/snmp6.c
-@@ -0,0 +1,133 @@
+@@ -0,0 +1,135 @@
 +/*
 +  This Plugin is based opn the interface.c Plugin.
 +*/
@@ -202,19 +202,21 @@ Signed-off-by: Nick Hainke <vincent@systemli.org>
 +#ifndef HAVE_IFADDRS_H
 +  return -1;
 +#else
-+  struct ifaddrs *addrs,*tmp;
 +
-+  getifaddrs(&addrs);
-+  tmp = addrs;
++  // getifaddrs is not working all the time (e.g. wireguard interfaces)
++  // instead we use if_nameindex() syscall as suggested in:
++  // https://stackoverflow.com/a/45796495/8474618
++  struct if_nameindex *if_nidxs, *intf;
 +
-+  while (tmp)
-+  {
-+    if (tmp->ifa_addr && tmp->ifa_addr->sa_family == AF_PACKET)
-+      snmp_read(tmp->ifa_name);
-+    tmp = tmp->ifa_next;
++  if_nidxs = if_nameindex();
++
++  if (if_nidxs != NULL) {
++    for (intf = if_nidxs; intf->if_index != 0 || intf->if_name != NULL; intf++) {
++      snmp_read(intf->if_name);
++    }
++    if_freenameindex(if_nidxs);
 +  }
 +
-+  freeifaddrs(addrs);
 +  snmp_read("all");
 +  return 0;
 +#endif

From 213c694b752ba35eade93fd3c3a286eab9c35eec Mon Sep 17 00:00:00 2001
From: Nick Hainke <vincent@systemli.org>
Date: Tue, 26 Jan 2021 14:42:31 +0100
Subject: [PATCH 2/2] collectd: snmp6 further improvements

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

Signed-off-by: Nick Hainke <vincent@systemli.org>
---
 .../collectd/patches/931-snmp6-add-ipv6-statistics.patch  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/utils/collectd/patches/931-snmp6-add-ipv6-statistics.patch b/utils/collectd/patches/931-snmp6-add-ipv6-statistics.patch
index 8f50b0fe6..94bfbac59 100644
--- a/utils/collectd/patches/931-snmp6-add-ipv6-statistics.patch
+++ b/utils/collectd/patches/931-snmp6-add-ipv6-statistics.patch
@@ -155,7 +155,7 @@ Signed-off-by: Nick Hainke <vincent@systemli.org>
 +int snmp_read(char *ifname) {
 +  FILE *fh;
 +  char buffer[1024];
-+  char *fields[16];
++  char *fields[2];
 +  int numfields;
 +  int currline = 0;
 +  derive_t data[76];
@@ -178,17 +178,17 @@ Signed-off-by: Nick Hainke <vincent@systemli.org>
 +  }
 +
 +  while (fgets(buffer, 1024, fh) != NULL) {
-+    numfields = strsplit(buffer, fields, 16);
++    numfields = strsplit(buffer, fields, 2);
 +
 +    if (numfields < 2)
-+      continue;
++      return -1;
 +
 +    data[currline++] = atoll(fields[1]);
 +  }
 +
 +  fclose(fh);
 +
-+  if (currline < 25) {
++  if (currline < 28) {
 +    return -1;
 +  }
 +