projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
contrib/snmp-probe-host.px: Don't fail silently, but outupt an empty config.
[collectd.git]
/
src
/
iptables.c
diff --git
a/src/iptables.c
b/src/iptables.c
index
5fa1f40
..
6522a55
100644
(file)
--- a/
src/iptables.c
+++ b/
src/iptables.c
@@
-106,7
+106,7
@@
static int iptables_config (const char *key, const char *value)
chain = fields[1];
table_len = strlen (table);
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);
{
ERROR ("Table `%s' too long.", table);
free (value_copy);
@@
-116,7
+116,7
@@
static int iptables_config (const char *key, const char *value)
temp.table[table_len] = '\0';
chain_len = strlen (chain);
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);
{
ERROR ("Chain `%s' too long.", chain);
free (value_copy);
@@
-219,12
+219,12
@@
static int submit_match (const struct ipt_entry_match *match,
vl.values = values;
vl.values_len = 1;
vl.time = time (NULL);
vl.values = values;
vl.values_len = 1;
vl.time = time (NULL);
- s
trcpy (vl.host, hostname_g
);
- s
trcpy (vl.plugin, "iptables"
);
+ s
strncpy (vl.host, hostname_g, sizeof (vl.host)
);
+ s
strncpy (vl.plugin, "iptables", sizeof (vl.plugin)
);
status = snprintf (vl.plugin_instance, sizeof (vl.plugin_instance),
"%s-%s", chain->table, chain->chain);
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')
return (0);
if (chain->name[0] != '\0')
@@
-284,7
+284,7
@@
static void submit_chain( iptc_handle_t *handle, ip_chain_t *chain ) {
static int iptables_read (void)
{
int i;
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++)
/* Init the iptc handle structure and query the correct table */
for (i = 0; i < chain_num; i++)
@@
-295,26
+295,24
@@
static int iptables_read (void)
chain = chain_list[i];
if (!chain)
{
chain = chain_list[i];
if (!chain)
{
- DEBUG ("chain == NULL");
+ DEBUG ("
iptables plugin:
chain == NULL");
continue;
}
continue;
}
- handle = iptc_init
( chain->table
);
+ handle = iptc_init
(chain->table
);
if (!handle)
{
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));
chain->table, iptc_strerror (errno));
+ num_failures++;
continue;
}
continue;
}
- plugin_relief (LOG_INFO, &complaint, "iptc_init (%s) succeeded",
- chain->table);
submit_chain (&handle, chain);
iptc_free (&handle);
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 iptables_read */
static int iptables_shutdown (void)