X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fiptables.c;h=5fa1f4086a8aa23dd5bfff14e289f0e80845d65c;hb=03b13552b2e9b4b19d3120d8dbb2ff8fc4ecf481;hp=1df35fa04d940b2f24e48625c3afc04ba7d0f51f;hpb=2f0dfdda8bc499fdb161c6a5850ec176e75bd4fa;p=collectd.git

diff --git a/src/iptables.c b/src/iptables.c
index 1df35fa0..5fa1f408 100644
--- a/src/iptables.c
+++ b/src/iptables.c
@@ -29,41 +29,10 @@
 # include <libiptc/libiptc.h>
 #endif
 
-#if HAVE_LIBIPTC_LIBIPTC_H
-# define IPTABLES_HAVE_READ 1
-#else
-# define IPTABLES_HAVE_READ 0
-#endif
-
-#define MODULE_NAME "iptables"
-#define BUFSIZE 512
-
 /*
  * (Module-)Global variables
  */
 
-/*
- * Removed packet count for now, should have config option if you want to save
- * them Although other collectd models don't seem to care much for options
- * eitherway for what to log
- */
-/* Limit to ~125MByte/s (~1GBit/s) */
-static data_source_t dsrc[1] =
-{
-	{"value",  DS_TYPE_COUNTER, 0.0, 134217728.0}
-};
-
-static data_set_t ipt_bytes_ds =
-{
-	"ipt_bytes", 1, dsrc
-};
-
-static data_set_t ipt_packets_ds =
-{
-	"ipt_packets", 1, dsrc
-};
-
-#if IPTABLES_HAVE_READ
 /*
  * Config format should be `Chain table chainname',
  * e. g. `Chain mangle incoming'
@@ -168,8 +137,12 @@ static int iptables_config (const char *key, const char *value)
 		    }
 		    else
 		    {
-			strncpy (temp.rule.comment, comment,
-				sizeof (temp.rule.comment) - 1);
+			temp.rule.comment = strdup (comment);
+			if (temp.rule.comment == NULL)
+			{
+			    free (value_copy);
+			    return (1);
+			}
 			temp.rule_type = RTYPE_COMMENT;
 		    }
 		}
@@ -217,9 +190,7 @@ static int iptables_config (const char *key, const char *value)
 
 	return (0);
 } /* int iptables_config */
-#endif /* IPTABLES_HAVE_READ */
 
-#if IPTABLES_HAVE_READ
 /* This needs to return `int' for IPT_MATCH_ITERATE to work. */
 static int submit_match (const struct ipt_entry_match *match,
 		const struct ipt_entry *entry,
@@ -351,35 +322,26 @@ static int iptables_shutdown (void)
     int i;
 
     for (i = 0; i < chain_num; i++)
+    {
+	if ((chain_list[i] != NULL) && (chain_list[i]->rule_type == RTYPE_COMMENT))
+	{
+	    sfree (chain_list[i]->rule.comment);
+	}
 	sfree (chain_list[i]);
+    }
     sfree (chain_list);
 
     return (0);
 } /* int iptables_shutdown */
-#endif /* IPTABLES_HAVE_READ */
 
-void module_register (modreg_e load)
+void module_register (void)
 {
-    if (load & MR_DATASETS)
-    {
-	plugin_register_data_set (&ipt_bytes_ds);
-	plugin_register_data_set (&ipt_packets_ds);
-    }
-
-#if IPTABLES_HAVE_READ
-    if (load & MR_READ)
-    {
-	plugin_register_config ("iptables", iptables_config,
-		config_keys, config_keys_num);
-	plugin_register_read ("iptables", iptables_read);
-	plugin_register_shutdown ("iptables", iptables_shutdown);
-    }
-#endif
+    plugin_register_config ("iptables", iptables_config,
+	    config_keys, config_keys_num);
+    plugin_register_read ("iptables", iptables_read);
+    plugin_register_shutdown ("iptables", iptables_shutdown);
 } /* void module_register */
 
-#undef BUFSIZE
-#undef MODULE_NAME
-
 /*
  * vim:shiftwidth=4:softtabstop=4:tabstop=8
  */