projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.4' into collectd-5.5
[collectd.git]
/
src
/
ipvs.c
diff --git
a/src/ipvs.c
b/src/ipvs.c
index
ab76f1e
..
cbb5542
100644
(file)
--- a/
src/ipvs.c
+++ b/
src/ipvs.c
@@
-45,7
+45,9
@@
#endif /* HAVE_NETINET_IN_H */
/* this can probably only be found in the kernel sources */
#endif /* HAVE_NETINET_IN_H */
/* this can probably only be found in the kernel sources */
-#if HAVE_NET_IP_VS_H
+#if HAVE_LINUX_IP_VS_H
+# include <linux/ip_vs.h>
+#elif HAVE_NET_IP_VS_H
# include <net/ip_vs.h>
#elif HAVE_IP_VS_H
# include <ip_vs.h>
# include <net/ip_vs.h>
#elif HAVE_IP_VS_H
# include <ip_vs.h>
@@
-293,7
+295,10
@@
static void cipvs_submit_service (struct ip_vs_service_entry *se)
int i = 0;
if (0 != get_pi (se, pi, sizeof (pi)))
int i = 0;
if (0 != get_pi (se, pi, sizeof (pi)))
+ {
+ free (dests);
return;
return;
+ }
cipvs_submit_connections (pi, NULL, stats.conns);
cipvs_submit_if (pi, "if_packets", NULL, stats.inpkts, stats.outpkts);
cipvs_submit_connections (pi, NULL, stats.conns);
cipvs_submit_if (pi, "if_packets", NULL, stats.inpkts, stats.outpkts);