projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
memcached plugin: Improve coding style a bit.
[collectd.git]
/
src
/
iptables.c
diff --git
a/src/iptables.c
b/src/iptables.c
index
576cd63
..
9abee36
100644
(file)
--- a/
src/iptables.c
+++ b/
src/iptables.c
@@
-25,7
+25,9
@@
#include "plugin.h"
#include "configfile.h"
#include "plugin.h"
#include "configfile.h"
-#if HAVE_LIBIPTC_LIBIPTC_H
+#if OWN_LIBIPTC
+# include "libiptc/libiptc.h"
+#else
# include <libiptc/libiptc.h>
#endif
# include <libiptc/libiptc.h>
#endif
@@
-105,8
+107,8
@@
static int iptables_config (const char *key, const char *value)
table = fields[0];
chain = fields[1];
table = fields[0];
chain = fields[1];
- table_len = strlen (table);
- if ((unsigned int)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);
{
ERROR ("Table `%s' too long.", table);
free (value_copy);
@@
-114,8
+116,8
@@
static int iptables_config (const char *key, const char *value)
}
sstrncpy (temp.table, table, table_len);
}
sstrncpy (temp.table, table, table_len);
- chain_len = strlen (chain);
- if ((unsigned int)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);
{
ERROR ("Chain `%s' too long.", chain);
free (value_copy);
@@
-216,9
+218,8
@@
static int submit_match (const struct ipt_entry_match *match,
vl.values = values;
vl.values_len = 1;
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 = ssnprintf (vl.plugin_instance, sizeof (vl.plugin_instance),
"%s-%s", chain->table, chain->chain);
status = ssnprintf (vl.plugin_instance, sizeof (vl.plugin_instance),
"%s-%s", chain->table, chain->chain);
@@
-239,11
+240,11
@@
static int submit_match (const struct ipt_entry_match *match,
sizeof (vl.type_instance));
}
sizeof (vl.type_instance));
}
- s
trcpy (vl.type, "ipt_bytes"
);
+ s
strncpy (vl.type, "ipt_bytes", sizeof (vl.type)
);
values[0].counter = (counter_t) entry->counters.bcnt;
plugin_dispatch_values (&vl);
values[0].counter = (counter_t) entry->counters.bcnt;
plugin_dispatch_values (&vl);
- s
trcpy (vl.type, "ipt_packets"
);
+ s
strncpy (vl.type, "ipt_packets", sizeof (vl.type)
);
values[0].counter = (counter_t) entry->counters.pcnt;
plugin_dispatch_values (&vl);
values[0].counter = (counter_t) entry->counters.pcnt;
plugin_dispatch_values (&vl);