remove unused variables.
use unsigned int to supress gcc warning.
change struct field name from total_length to data_length.
compare bitmask by nfct_bitmask_test_bit().
change tmpl_cur to void * to calc size.
Signed-off-by Ken-ichirou MATSUZAWA <chamas@xxxxxxxxxxxxx>
---
output/ulogd_output_IPFIX.c | 51 +++++++++++++++------------------------------
1 file changed, 17 insertions(+), 34 deletions(-)
diff --git a/output/ulogd_output_IPFIX.c b/output/ulogd_output_IPFIX.c
index 333d532..a18b0d8 100644
--- a/output/ulogd_output_IPFIX.c
+++ b/output/ulogd_output_IPFIX.c
@@ -105,8 +105,8 @@ struct ipfix_template {
struct ulogd_ipfix_template {
struct llist_head list;
struct nfct_bitmask *bitmask;
- unsigned int total_length; /* length of the DATA */
- char *tmpl_cur; /* cursor into current template position */
+ unsigned int data_length; /* length of the DATA */
+ void *tmpl_cur; /* cursor into current template position */
struct ipfix_template tmpl;
};
@@ -116,13 +116,7 @@ struct ipfix_instance {
int sock_proto; /* protocol (IPPROTO_*) */
struct llist_head template_list;
-
- struct ipfix_template *tmpl;
- unsigned int tmpl_len;
-
struct nfct_bitmask *valid_bitmask; /* bitmask of valid keys */
-
- unsigned int total_length; /* total size of all data elements */
};
#define ULOGD_IPFIX_TEMPL_BASE 1024
@@ -133,8 +127,6 @@ struct ulogd_ipfix_template *
build_template_for_bitmask(struct ulogd_pluginstance *upi,
struct nfct_bitmask *bm)
{
- struct ipfix_instance *ii = (struct ipfix_instance *) &upi->private;
- struct ipfix_templ_rec_hdr *rhdr;
struct ulogd_ipfix_template *tmpl;
unsigned int i, j;
int size = sizeof(struct ulogd_ipfix_template)
@@ -156,27 +148,14 @@ build_template_for_bitmask(struct ulogd_pluginstance *upi,
tmpl->tmpl_cur = tmpl->tmpl.buf;
- tmpl->total_length = 0;
+ tmpl->data_length = 0;
for (i = 0, j = 0; i < upi->input.num_keys; i++) {
struct ulogd_key *key = &upi->input.keys[i];
int length = ulogd_key_size(key);
- if (!(key->u.source->flags & ULOGD_RETF_VALID))
- continue;
-
- if (length < 0 || length > 0xfffe) {
- ulogd_log(ULOGD_INFO, "ignoring key `%s' because "
- "it has an ipfix incompatible length\n",
- key->name);
+ if (!nfct_bitmask_test_bit(tmpl->bitmask, i))
continue;
- }
-
- if (key->ipfix.field_id == 0) {
- ulogd_log(ULOGD_INFO, "ignoring key `%s' because "
- "it has no field_id\n", key->name);
- continue;
- }
if (key->ipfix.vendor == IPFIX_VENDOR_IETF) {
struct ipfix_ietf_field *field =
@@ -194,7 +173,7 @@ build_template_for_bitmask(struct ulogd_pluginstance *upi,
field->length = htons(length);
tmpl->tmpl_cur += sizeof(*field);
}
- tmpl->total_length += length;
+ tmpl->data_length += length;
j++;
}
@@ -224,8 +203,7 @@ static int output_ipfix(struct ulogd_pluginstance *upi)
{
struct ipfix_instance *ii = (struct ipfix_instance *) &upi->private;
struct ulogd_ipfix_template *template;
- unsigned int total_size;
- int i;
+ unsigned int total_size, i;
/* FIXME: it would be more cache efficient if the IS_VALID
* flags would be a separate bitmask outside of the array.
@@ -235,10 +213,17 @@ static int output_ipfix(struct ulogd_pluginstance *upi)
nfct_bitmask_clear(ii->valid_bitmask);
for (i = 0; i < upi->input.num_keys; i++) {
- struct ulogd_key *key = upi->input.keys[i].u.source;
+ struct ulogd_key *key = &upi->input.keys[i];
+ int length = ulogd_key_size(key);
- if (key->flags & ULOGD_RETF_VALID)
- nfct_bitmask_set_bit(ii->valid_bitmask, i);
+ if (length < 0 || length > 0xfffe)
+ continue;
+ if (!(key->u.source->flags & ULOGD_RETF_VALID))
+ continue;
+ if (key->ipfix.field_id == 0)
+ continue;
+
+ nfct_bitmask_set_bit(ii->valid_bitmask, i);
}
/* lookup template ID for this bitmask */
@@ -253,7 +238,7 @@ static int output_ipfix(struct ulogd_pluginstance *upi)
llist_add(&template->list, &ii->template_list);
}
- total_size = template->total_length;
+ total_size = template->data_length;
/* decide if it's time to retransmit our template and (optionally)
* prepend it into the to-be-sent IPFIX message */
@@ -382,8 +367,6 @@ static int stop_ipfix(struct ulogd_pluginstance *pi)
static void signal_handler_ipfix(struct ulogd_pluginstance *pi, int signal)
{
- struct ipfix_instance *li = (struct ipfix_instance *) &pi->private;
-
switch (signal) {
case SIGHUP:
ulogd_log(ULOGD_NOTICE, "ipfix: reopening connection\n");
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
