# 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'
*/
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);
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);
}
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;
}
}
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,
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')
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++)
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)
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
*/