projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3207 from dago/cppflagsbugs
[collectd.git]
/
src
/
iptables.c
diff --git
a/src/iptables.c
b/src/iptables.c
index
bc75d7b
..
ea2d240
100644
(file)
--- a/
src/iptables.c
+++ b/
src/iptables.c
@@
-26,8
+26,8
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
+#include "utils/common/common.h"
#include <libiptc/libip6tc.h>
#include <libiptc/libiptc.h>
#include <libiptc/libip6tc.h>
#include <libiptc/libiptc.h>
@@
-86,8
+86,8
@@
typedef struct {
char name[64];
} ip_chain_t;
char name[64];
} ip_chain_t;
-static ip_chain_t **chain_list
= NULL
;
-static int chain_num
= 0
;
+static ip_chain_t **chain_list;
+static int chain_num;
static int iptables_config(const char *key, const char *value) {
/* int ip_value; */
static int iptables_config(const char *key, const char *value) {
/* int ip_value; */
@@
-103,9
+103,7
@@
static int iptables_config(const char *key, const char *value) {
ip_chain_t temp = {0};
ip_chain_t *final, **list;
char *table;
ip_chain_t temp = {0};
ip_chain_t *final, **list;
char *table;
- int table_len;
char *chain;
char *chain;
- int chain_len;
char *value_copy;
char *fields[4];
char *value_copy;
char *fields[4];
@@
-136,16
+134,16
@@
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) + 1;
- if (
(unsigned int)
table_len > sizeof(temp.table)) {
+
size_t
table_len = strlen(table) + 1;
+ if (table_len > sizeof(temp.table)) {
ERROR("Table `%s' too long.", table);
free(value_copy);
return 1;
}
sstrncpy(temp.table, table, table_len);
ERROR("Table `%s' too long.", table);
free(value_copy);
return 1;
}
sstrncpy(temp.table, table, table_len);
- chain_len = strlen(chain) + 1;
- if (
(unsigned int)
chain_len > sizeof(temp.chain)) {
+
size_t
chain_len = strlen(chain) + 1;
+ if (chain_len > sizeof(temp.chain)) {
ERROR("Chain `%s' too long.", chain);
free(value_copy);
return 1;
ERROR("Chain `%s' too long.", chain);
free(value_copy);
return 1;
@@
-223,8
+221,8
@@
static int submit6_match(const struct ip6t_entry_match *match,
sstrncpy(vl.plugin, "ip6tables", sizeof(vl.plugin));
sstrncpy(vl.plugin, "ip6tables", sizeof(vl.plugin));
- status = snprintf(vl.plugin_instance, sizeof(vl.plugin_instance), "%s-%s",
- chain->table, chain->chain);
+ status = s
s
nprintf(vl.plugin_instance, sizeof(vl.plugin_instance), "%s-%s",
+
chain->table, chain->chain);
if ((status < 1) || ((unsigned int)status >= sizeof(vl.plugin_instance)))
return 0;
if ((status < 1) || ((unsigned int)status >= sizeof(vl.plugin_instance)))
return 0;
@@
-232,8
+230,8
@@
static int submit6_match(const struct ip6t_entry_match *match,
sstrncpy(vl.type_instance, chain->name, sizeof(vl.type_instance));
} else {
if (chain->rule_type == RTYPE_NUM)
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), "%i",
- chain->rule.num);
+ s
s
nprintf(vl.type_instance, sizeof(vl.type_instance), "%i",
+
chain->rule.num);
else
sstrncpy(vl.type_instance, (char *)match->data, sizeof(vl.type_instance));
}
else
sstrncpy(vl.type_instance, (char *)match->data, sizeof(vl.type_instance));
}
@@
-271,8
+269,8
@@
static int submit_match(const struct ipt_entry_match *match,
sstrncpy(vl.plugin, "iptables", sizeof(vl.plugin));
sstrncpy(vl.plugin, "iptables", sizeof(vl.plugin));
- status = snprintf(vl.plugin_instance, sizeof(vl.plugin_instance), "%s-%s",
- chain->table, chain->chain);
+ status = s
s
nprintf(vl.plugin_instance, sizeof(vl.plugin_instance), "%s-%s",
+
chain->table, chain->chain);
if ((status < 1) || ((unsigned int)status >= sizeof(vl.plugin_instance)))
return 0;
if ((status < 1) || ((unsigned int)status >= sizeof(vl.plugin_instance)))
return 0;
@@
-280,8
+278,8
@@
static int submit_match(const struct ipt_entry_match *match,
sstrncpy(vl.type_instance, chain->name, sizeof(vl.type_instance));
} else {
if (chain->rule_type == RTYPE_NUM)
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), "%i",
- chain->rule.num);
+ s
s
nprintf(vl.type_instance, sizeof(vl.type_instance), "%i",
+
chain->rule.num);
else
sstrncpy(vl.type_instance, (char *)match->data, sizeof(vl.type_instance));
}
else
sstrncpy(vl.type_instance, (char *)match->data, sizeof(vl.type_instance));
}