diff options
| author | Ulrich Weber <uw@xyne.com> | 2013-10-09 12:00:01 +0200 |
|---|---|---|
| committer | Eric Leblond <eric@regit.org> | 2013-10-10 02:31:47 +0200 |
| commit | 7ecbef1eb3f49afc8349b3a75f22b253856e60db (patch) | |
| tree | 8b13393b2a015b1d777a4658900a42da5146dae1 /input/flow/ulogd_inpflow_NFCT.c | |
| parent | 471a5502bf16dab3a13c8c14469582897f43ee7e (diff) | |
nfct: make NFCT packet counter/length 64 bit
Kernel and libnetfilter_conntrack counters are 64bit,
so use 64bit too in ulogd instead of 32bit.
Worked fine on little endian systems but big endian systems
had zero counter...
Didn't test ipfix output, but RFC allows template with
either 32 or 64 counters, so should be safe.
Signed-off-by: Ulrich Weber <uw@xyne.com>
Signed-off-by: Eric Leblond <eric@regit.org>
Diffstat (limited to 'input/flow/ulogd_inpflow_NFCT.c')
| -rw-r--r-- | input/flow/ulogd_inpflow_NFCT.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/input/flow/ulogd_inpflow_NFCT.c b/input/flow/ulogd_inpflow_NFCT.c index afb6c18..ab2bc10 100644 --- a/input/flow/ulogd_inpflow_NFCT.c +++ b/input/flow/ulogd_inpflow_NFCT.c @@ -240,7 +240,7 @@ static struct ulogd_key nfct_okeys[] = { }, }, { - .type = ULOGD_RET_UINT32, + .type = ULOGD_RET_UINT64, .flags = ULOGD_RETF_NONE, .name = "orig.raw.pktlen", .ipfix = { @@ -250,7 +250,7 @@ static struct ulogd_key nfct_okeys[] = { }, }, { - .type = ULOGD_RET_UINT32, + .type = ULOGD_RET_UINT64, .flags = ULOGD_RETF_NONE, .name = "orig.raw.pktcount", .ipfix = { @@ -305,7 +305,7 @@ static struct ulogd_key nfct_okeys[] = { }, }, { - .type = ULOGD_RET_UINT32, + .type = ULOGD_RET_UINT64, .flags = ULOGD_RETF_NONE, .name = "reply.raw.pktlen", .ipfix = { @@ -315,7 +315,7 @@ static struct ulogd_key nfct_okeys[] = { }, }, { - .type = ULOGD_RET_UINT32, + .type = ULOGD_RET_UINT64, .flags = ULOGD_RETF_NONE, .name = "reply.raw.pktcount", .ipfix = { @@ -561,14 +561,14 @@ static int propagate_ct(struct ulogd_pluginstance *main_upi, htons(nfct_get_attr_u16(ct, ATTR_REPL_PORT_DST))); } - okey_set_u32(&ret[NFCT_ORIG_RAW_PKTLEN], - nfct_get_attr_u32(ct, ATTR_ORIG_COUNTER_BYTES)); - okey_set_u32(&ret[NFCT_ORIG_RAW_PKTCOUNT], - nfct_get_attr_u32(ct, ATTR_ORIG_COUNTER_PACKETS)); - okey_set_u32(&ret[NFCT_REPLY_RAW_PKTLEN], - nfct_get_attr_u32(ct, ATTR_REPL_COUNTER_BYTES)); - okey_set_u32(&ret[NFCT_REPLY_RAW_PKTCOUNT], - nfct_get_attr_u32(ct, ATTR_REPL_COUNTER_PACKETS)); + okey_set_u64(&ret[NFCT_ORIG_RAW_PKTLEN], + nfct_get_attr_u64(ct, ATTR_ORIG_COUNTER_BYTES)); + okey_set_u64(&ret[NFCT_ORIG_RAW_PKTCOUNT], + nfct_get_attr_u64(ct, ATTR_ORIG_COUNTER_PACKETS)); + okey_set_u64(&ret[NFCT_REPLY_RAW_PKTLEN], + nfct_get_attr_u64(ct, ATTR_REPL_COUNTER_BYTES)); + okey_set_u64(&ret[NFCT_REPLY_RAW_PKTCOUNT], + nfct_get_attr_u64(ct, ATTR_REPL_COUNTER_PACKETS)); okey_set_u32(&ret[NFCT_CT_MARK], nfct_get_attr_u32(ct, ATTR_MARK)); okey_set_u32(&ret[NFCT_CT_ID], nfct_get_attr_u32(ct, ATTR_ID)); |