#include "plugin.h"
#include "configfile.h"
-#if HAVE_LIBIPTC_LIBIPTC_H
+#if OWN_LIBIPTC
+# include "libiptc/libiptc.h"
+#else
# include <libiptc/libiptc.h>
#endif
table = fields[0];
chain = fields[1];
- table_len = strlen (table);
- if (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 (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)
{
}
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;
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 >= sizeof (vl.plugin_instance)) || (status < 1))
+ 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 */
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)