src/plugin.c: assert (ds->ds_num == vl->values_len); when debug is enabled.

[collectd.git] / src / iptables.c

diff --git a/src/iptables.c b/src/iptables.c
index bc15559..c48199a 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',
@@ -119,7 +103,9 @@ static int iptables_config (const char *key, const char *value)
                value_copy = strdup (value);
                if (value_copy == NULL)
                {
-                   ERROR ("strdup failed: %s", strerror (errno));
+                   char errbuf[1024];
+                   ERROR ("strdup failed: %s",
+                           sstrerror (errno, errbuf, sizeof (errbuf)));
                    return (1);
                }
 
@@ -187,16 +173,20 @@ static int iptables_config (const char *key, const char *value)
                list = (ip_chain_t **) realloc (chain_list, (chain_num + 1) * sizeof (ip_chain_t *));
                if (list == NULL)
                {
-                       ERROR ("realloc failed: %s", strerror (errno));
-                       return (1);
+                   char errbuf[1024];
+                   ERROR ("realloc failed: %s",
+                           sstrerror (errno, errbuf, sizeof (errbuf)));
+                   return (1);
                }
 
                chain_list = list;
                final = (ip_chain_t *) malloc( sizeof(temp) );
                if (final == NULL) 
                {
-                       ERROR ("malloc failed: %s", strerror (errno));
-                       return (1);
+                   char errbuf[1024];
+                   ERROR ("malloc failed: %s",
+                           sstrerror (errno, errbuf, sizeof (errbuf)));
+                   return (1);
                }
                memcpy (final, &temp, sizeof (temp));
                chain_list[chain_num] = final;
@@ -345,7 +335,9 @@ static int iptables_shutdown (void)
     int i;
 
     for (i = 0; i < chain_num; i++)
+    {
        sfree (chain_list[i]);
+    }
     sfree (chain_list);
 
     return (0);
@@ -354,16 +346,13 @@ static int iptables_shutdown (void)
 
 void module_register (void)
 {
-    plugin_register_data_set (&ipt_bytes_ds);
-    plugin_register_data_set (&ipt_packets_ds);
-
 #if IPTABLES_HAVE_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
-}
+} /* void module_register */
 
 #undef BUFSIZE
 #undef MODULE_NAME