Merge branch 'collectd-4.0'

[collectd.git] / src / iptables.c

diff --git a/src/iptables.c b/src/iptables.c
index 1df35fa..8dc5710 100644 (file)
--- a/src/iptables.c
+++ b/src/iptables.c
@@ -47,22 +47,6 @@
  * 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',
@@ -168,8 +152,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;
                    }
                }
@@ -351,29 +339,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);
-    }
+    plugin_register_config ("iptables", iptables_config,
+           config_keys, config_keys_num);
+    plugin_register_read ("iptables", iptables_read);
+    plugin_register_shutdown ("iptables", iptables_shutdown);
 #endif
 } /* void module_register */