X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fiptables.c;h=ea8c65e9008916c6004d4ce0b9e41f24f78cba64;hb=714644fb443eb2dc8fd8c683cae171caef40cf7a;hp=5fa1f4086a8aa23dd5bfff14e289f0e80845d65c;hpb=7c6b8505e5557622158574c8dce8ba53c53cec72;p=collectd.git

diff --git a/src/iptables.c b/src/iptables.c
index 5fa1f408..ea8c65e9 100644
--- a/src/iptables.c
+++ b/src/iptables.c
@@ -25,7 +25,9 @@
 #include "plugin.h"
 #include "configfile.h"
 
-#if HAVE_LIBIPTC_LIBIPTC_H
+#if OWN_LIBIPTC
+# include "libiptc/libiptc.h"
+#else
 # include <libiptc/libiptc.h>
 #endif
 
@@ -106,7 +108,7 @@ static int iptables_config (const char *key, const char *value)
 		chain = fields[1];
 
 		table_len = strlen (table);
-		if (table_len >= sizeof(temp.table))
+		if ((unsigned int)table_len >= sizeof(temp.table))
 		{
 			ERROR ("Table `%s' too long.", table);
 			free (value_copy);
@@ -116,7 +118,7 @@ static int iptables_config (const char *key, const char *value)
 		temp.table[table_len] = '\0';
 
 		chain_len = strlen (chain);
-		if (chain_len >= sizeof(temp.chain))
+		if ((unsigned int)chain_len >= sizeof(temp.chain))
 		{
 			ERROR ("Chain `%s' too long.", chain);
 			free (value_copy);
@@ -219,12 +221,12 @@ static int submit_match (const struct ipt_entry_match *match,
     vl.values = values;
     vl.values_len = 1;
     vl.time = time (NULL);
-    strcpy (vl.host, hostname_g);
-    strcpy (vl.plugin, "iptables");
+    sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+    sstrncpy (vl.plugin, "iptables", sizeof (vl.plugin));
 
     status = snprintf (vl.plugin_instance, sizeof (vl.plugin_instance),
 	    "%s-%s", chain->table, chain->chain);
-    if ((status >= sizeof (vl.plugin_instance)) || (status < 1))
+    if ((status < 1) || ((unsigned int)status >= sizeof (vl.plugin_instance)))
 	return (0);
 
     if (chain->name[0] != '\0')
@@ -284,7 +286,7 @@ static void submit_chain( iptc_handle_t *handle, ip_chain_t *chain ) {
 static int iptables_read (void)
 {
     int i;
-    static complain_t complaint;
+    int num_failures = 0;
 
     /* Init the iptc handle structure and query the correct table */    
     for (i = 0; i < chain_num; i++)
@@ -295,26 +297,24 @@ static int iptables_read (void)
 	chain = chain_list[i];
 	if (!chain)
 	{
-	    DEBUG ("chain == NULL");
+	    DEBUG ("iptables plugin: chain == NULL");
 	    continue;
 	}
 
-	handle = iptc_init( chain->table );
+	handle = iptc_init (chain->table);
 	if (!handle)
 	{
-	    DEBUG ("iptc_init (%s) failed: %s", chain->table, iptc_strerror (errno));
-	    plugin_complain (LOG_ERR, &complaint, "iptc_init (%s) failed: %s",
+	    ERROR ("iptables plugin: iptc_init (%s) failed: %s",
 		    chain->table, iptc_strerror (errno));
+	    num_failures++;
 	    continue;
 	}
-	plugin_relief (LOG_INFO, &complaint, "iptc_init (%s) succeeded",
-		chain->table);
 
 	submit_chain (&handle, chain);
 	iptc_free (&handle);
-    }
+    } /* for (i = 0 .. chain_num) */
 
-    return (0);
+    return ((num_failures < chain_num) ? 0 : -1);
 } /* int iptables_read */
 
 static int iptables_shutdown (void)