X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fipvs.c;h=ab76f1eb8638d2517dd1e56ddb981148d17ed556;hb=6286127470b83578c2889db546cfa32cb0fe0147;hp=68a3d7f3bf9d46a9f47c17492a6acd926458cfbc;hpb=58ecdb7ff9a4d90e87daecca05b9cb4a43070fd7;p=collectd.git

diff --git a/src/ipvs.c b/src/ipvs.c
index 68a3d7f3..4345a465 100644
--- a/src/ipvs.c
+++ b/src/ipvs.c
@@ -37,15 +37,14 @@
 #if HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif /* HAVE_ARPA_INET_H */
-#if HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif /* HAVE_SYS_SOCKET_H */
 #if HAVE_NETINET_IN_H
 # include <netinet/in.h>
 #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>
@@ -191,11 +190,11 @@ static int get_pi (struct ip_vs_service_entry *se, char *pi, size_t size)
 
 	/* inet_ntoa() returns a pointer to a statically allocated buffer
 	 * I hope non-glibc systems behave the same */
-	len = snprintf (pi, size, "%s_%s%u", inet_ntoa (addr),
+	len = ssnprintf (pi, size, "%s_%s%u", inet_ntoa (addr),
 			(se->protocol == IPPROTO_TCP) ? "TCP" : "UDP",
 			ntohs (se->port));
 
-	if ((0 > len) || (size <= len)) {
+	if ((0 > len) || (size <= ((size_t) len))) {
 		log_err ("plugin instance truncated: %s", pi);
 		return -1;
 	}
@@ -215,59 +214,57 @@ static int get_ti (struct ip_vs_dest_entry *de, char *ti, size_t size)
 
 	/* inet_ntoa() returns a pointer to a statically allocated buffer
 	 * I hope non-glibc systems behave the same */
-	len = snprintf (ti, size, "%s_%u", inet_ntoa (addr),
+	len = ssnprintf (ti, size, "%s_%u", inet_ntoa (addr),
 			ntohs (de->port));
 
-	if ((0 > len) || (size <= len)) {
+	if ((0 > len) || (size <= ((size_t) len))) {
 		log_err ("type instance truncated: %s", ti);
 		return -1;
 	}
 	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;
 
-	values[0].counter = value;
+	values[0].derive = value;
 
 	vl.values     = values;
 	vl.values_len = 1;
 
-	vl.time     = time (NULL);
-	vl.interval = interval_g;
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "ipvs", sizeof (vl.plugin));
+	sstrncpy (vl.plugin_instance, pi, sizeof (vl.plugin_instance));
+	sstrncpy (vl.type, "connections", sizeof (vl.type));
+	sstrncpy (vl.type_instance, (NULL != ti) ? ti : "total",
+		sizeof (vl.type_instance));
 
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "ipvs");
-	strcpy (vl.plugin_instance, pi);
-	strcpy (vl.type_instance, (NULL != ti) ? ti : "total");
-
-	plugin_dispatch_values ("connections", &vl);
+	plugin_dispatch_values (&vl);
 	return;
 } /* 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;
 
-	values[0].counter = rx;
-	values[1].counter = tx;
+	values[0].derive = rx;
+	values[1].derive = tx;
 
 	vl.values     = values;
 	vl.values_len = 2;
 
-	vl.time     = time (NULL);
-	vl.interval = interval_g;
-
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "ipvs");
-	strcpy (vl.plugin_instance, pi);
-	strcpy (vl.type_instance, (NULL != ti) ? ti : "total");
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "ipvs", sizeof (vl.plugin));
+	sstrncpy (vl.plugin_instance, pi, sizeof (vl.plugin_instance));
+	sstrncpy (vl.type, t, sizeof (vl.type));
+	sstrncpy (vl.type_instance, (NULL != ti) ? ti : "total",
+		sizeof (vl.type_instance));
 
-	plugin_dispatch_values (t, &vl);
+	plugin_dispatch_values (&vl);
 	return;
 } /* cipvs_submit_if */
 
@@ -276,7 +273,7 @@ static void cipvs_submit_dest (char *pi, struct ip_vs_dest_entry *de) {
 
 	char ti[DATA_MAX_NAME_LEN];
 
-	if (0 != get_ti (de, ti, DATA_MAX_NAME_LEN))
+	if (0 != get_ti (de, ti, sizeof (ti)))
 		return;
 
 	cipvs_submit_connections (pi, ti, stats.conns);
@@ -292,10 +289,13 @@ static void cipvs_submit_service (struct ip_vs_service_entry *se)
 
 	char pi[DATA_MAX_NAME_LEN];
 
-	int i = 0;
+	size_t i;
 
-	if (0 != get_pi (se, pi, DATA_MAX_NAME_LEN))
+	if (0 != get_pi (se, pi, sizeof (pi)))
+	{
+		free (dests);
 		return;
+	}
 
 	cipvs_submit_connections (pi, NULL, stats.conns);
 	cipvs_submit_if (pi, "if_packets", NULL, stats.inpkts, stats.outpkts);
@@ -311,7 +311,7 @@ static void cipvs_submit_service (struct ip_vs_service_entry *se)
 static int cipvs_read (void)
 {
 	struct ip_vs_get_services *services = NULL;
-	int i = 0;
+	size_t i;
 
 	if (sockfd < 0)
 		return (-1);