X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fiptables.c;h=12275cd09921aa594ba0e2f80e49b6c3da296780;hb=526320a0389a54a3629038fe6b34da8c6d4eec0e;hp=72b4481cc5148ff500d6ed01076c12378a6c3932;hpb=9ebb82bf36ac779a8af81f2e9a513226387a5679;p=collectd.git

diff --git a/src/iptables.c b/src/iptables.c
index 72b4481c..12275cd0 100644
--- a/src/iptables.c
+++ b/src/iptables.c
@@ -1,6 +1,7 @@
 /**
  * collectd - src/iptables.c
  * Copyright (C) 2007 Sjoerd van der Berg
+ * Copyright (C) 2007 Florian octo Forster
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -18,6 +19,7 @@
  *
  * Authors:
  *  Sjoerd van der Berg <harekiet at users.sourceforge.net>
+ *  Florian Forster <octo at verplant.org>
  **/
 
 #include "collectd.h"
@@ -25,7 +27,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
 
@@ -105,25 +109,23 @@ static int iptables_config (const char *key, const char *value)
 		table = fields[0];
 		chain = fields[1];
 
-		table_len = strlen (table);
-		if ((unsigned int)table_len >= sizeof(temp.table))
+		table_len = strlen (table) + 1;
+		if ((unsigned int)table_len > sizeof(temp.table))
 		{
 			ERROR ("Table `%s' too long.", table);
 			free (value_copy);
 			return (1);
 		}
-		strncpy (temp.table, table, table_len);
-		temp.table[table_len] = '\0';
+		sstrncpy (temp.table, table, table_len);
 
-		chain_len = strlen (chain);
-		if ((unsigned int)chain_len >= sizeof(temp.chain))
+		chain_len = strlen (chain) + 1;
+		if ((unsigned int)chain_len > sizeof(temp.chain))
 		{
 			ERROR ("Chain `%s' too long.", chain);
 			free (value_copy);
 			return (1);
 		}
-		strncpy (temp.chain, chain, chain_len);
-		temp.chain[chain_len] = '\0'; 
+		sstrncpy (temp.chain, chain, chain_len);
 
 		if (fields_num >= 3)
 		{
@@ -152,7 +154,7 @@ static int iptables_config (const char *key, const char *value)
 		}
 
 		if (fields_num >= 4)
-		    strncpy (temp.name, fields[3], sizeof (temp.name) - 1);
+		    sstrncpy (temp.name, fields[3], sizeof (temp.name));
 
 		free (value_copy);
 		value_copy = NULL;
@@ -218,35 +220,35 @@ 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),
+    status = ssnprintf (vl.plugin_instance, sizeof (vl.plugin_instance),
 	    "%s-%s", chain->table, chain->chain);
     if ((status < 1) || ((unsigned int)status >= sizeof (vl.plugin_instance)))
 	return (0);
 
     if (chain->name[0] != '\0')
     {
-	strncpy (vl.type_instance, chain->name, sizeof (vl.type_instance));
+	sstrncpy (vl.type_instance, chain->name, sizeof (vl.type_instance));
     }
     else
     {
 	if (chain->rule_type == RTYPE_NUM)
-	    snprintf (vl.type_instance, sizeof (vl.type_instance),
+	    ssnprintf (vl.type_instance, sizeof (vl.type_instance),
 		    "%i", chain->rule.num);
 	else
-	    strncpy (vl.type_instance, (char *) match->data,
+	    sstrncpy (vl.type_instance, (char *) match->data,
 		    sizeof (vl.type_instance));
     }
-    vl.type_instance[sizeof (vl.type_instance) - 1] = '\0';
 
+    sstrncpy (vl.type, "ipt_bytes", sizeof (vl.type));
     values[0].counter = (counter_t) entry->counters.bcnt;
-    plugin_dispatch_values ("ipt_bytes", &vl);
+    plugin_dispatch_values (&vl);
 
+    sstrncpy (vl.type, "ipt_packets", sizeof (vl.type));
     values[0].counter = (counter_t) entry->counters.pcnt;
-    plugin_dispatch_values ("ipt_packets", &vl);
+    plugin_dispatch_values (&vl);
 
     return (0);
 } /* void submit_match */