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
f3a583b
..
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>
@@
-225,12
+227,12
@@
static int get_ti (struct ip_vs_dest_entry *de, char *ti, size_t size)
return 0;
} /* get_ti */
return 0;
} /* get_ti */
-static void cipvs_submit_connections (char *pi, char *ti,
counter
_t value)
+static void cipvs_submit_connections (char *pi, char *ti,
derive
_t value)
{
value_t values[1];
value_list_t vl = VALUE_LIST_INIT;
{
value_t values[1];
value_list_t vl = VALUE_LIST_INIT;
- values[0].
counter
= value;
+ values[0].
derive
= value;
vl.values = values;
vl.values_len = 1;
vl.values = values;
vl.values_len = 1;
@@
-247,13
+249,13
@@
static void cipvs_submit_connections (char *pi, char *ti, counter_t value)
} /* cipvs_submit_connections */
static void cipvs_submit_if (char *pi, char *t, char *ti,
} /* cipvs_submit_connections */
static void cipvs_submit_if (char *pi, char *t, char *ti,
-
counter_t rx, counter
_t tx)
+
derive_t rx, derive
_t tx)
{
value_t values[2];
value_list_t vl = VALUE_LIST_INIT;
{
value_t values[2];
value_list_t vl = VALUE_LIST_INIT;
- values[0].
counter
= rx;
- values[1].
counter
= tx;
+ values[0].
derive
= rx;
+ values[1].
derive
= tx;
vl.values = values;
vl.values_len = 2;
vl.values = values;
vl.values_len = 2;
@@
-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);