X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fipvs.c;h=4345a46532237081bcd8ff075102e6d34635f4a7;hb=d69c181126dcf75dcc1c93954463ba32ca340b39;hp=fa894897bae658b532e9af4f692d3bd802e6f4b6;hpb=76a7816d2c066f2feff5c77e7da58df4dbc982c2;p=collectd.git

diff --git a/src/ipvs.c b/src/ipvs.c
index fa894897..4345a465 100644
--- a/src/ipvs.c
+++ b/src/ipvs.c
@@ -37,9 +37,6 @@
 #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 */
@@ -197,7 +194,7 @@ static int get_pi (struct ip_vs_service_entry *se, char *pi, size_t size)
 			(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;
 	}
@@ -220,7 +217,7 @@ static int get_ti (struct ip_vs_dest_entry *de, char *ti, size_t size)
 	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;
 	}
@@ -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, 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);