summaryrefslogtreecommitdiffstats
path: root/input/sum
diff options
context:
space:
mode:
authorEric Leblond <eric@regit.org>2012-08-01 11:27:16 +0000
committerPablo Neira Ayuso <pablo@netfilter.org>2012-08-03 16:48:19 +0200
commit9e34a74f37760dec5876f572019a46db5376e4c4 (patch)
treed9d4f66c48a04015bb4c63f21341c92875180592 /input/sum
parent70aa6a7dffb63d323efa775ca81e251b7f417e4e (diff)
nfacct: add timestamp option
This patch adds a timestamp option to the nfacct plugin. If activated, nfacct output a timestamp which is computed just after sending the nfacct request. Signed-off-by: Eric Leblond <eric@regit.org> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'input/sum')
-rw-r--r--input/sum/ulogd_inpflow_NFACCT.c32
1 files changed, 31 insertions, 1 deletions
diff --git a/input/sum/ulogd_inpflow_NFACCT.c b/input/sum/ulogd_inpflow_NFACCT.c
index 7852b27..b022e63 100644
--- a/input/sum/ulogd_inpflow_NFACCT.c
+++ b/input/sum/ulogd_inpflow_NFACCT.c
@@ -30,6 +30,7 @@ struct nfacct_pluginstance {
uint32_t seq;
struct ulogd_fd ufd;
struct ulogd_timer timer;
+ struct timeval tv;
};
static struct config_keyset nfacct_kset = {
@@ -45,18 +46,27 @@ static struct config_keyset nfacct_kset = {
.type = CONFIG_TYPE_INT,
.options = CONFIG_OPT_NONE,
.u.value = 1,
+ },
+ {
+ .key = "timestamp",
+ .type = CONFIG_TYPE_INT,
+ .options = CONFIG_OPT_NONE,
+ .u.value = 0,
}
},
- .num_ces = 2,
+ .num_ces = 3,
};
#define pollint_ce(x) (x->ces[0])
#define zerocounter_ce(x) (x->ces[1])
+#define timestamp_ce(x) (x->ces[2])
enum ulogd_nfacct_keys {
ULOGD_NFACCT_NAME,
ULOGD_NFACCT_PKTS,
ULOGD_NFACCT_BYTES,
ULOGD_NFACCT_RAW,
+ ULOGD_NFACCT_TIME_SEC,
+ ULOGD_NFACCT_TIME_USEC,
};
static struct ulogd_key nfacct_okeys[] = {
@@ -80,12 +90,23 @@ static struct ulogd_key nfacct_okeys[] = {
.flags = ULOGD_RETF_NONE,
.name = "sum",
},
+ [ULOGD_NFACCT_TIME_SEC] = {
+ .type = ULOGD_RET_UINT32,
+ .flags = ULOGD_RETF_NONE,
+ .name = "oob.time.sec",
+ },
+ [ULOGD_NFACCT_TIME_USEC] = {
+ .type = ULOGD_RET_UINT32,
+ .flags = ULOGD_RETF_NONE,
+ .name = "oob.time.usec",
+ },
};
static void
propagate_nfacct(struct ulogd_pluginstance *upi, struct nfacct *nfacct)
{
struct ulogd_key *ret = upi->output.keys;
+ struct nfacct_pluginstance *cpi = (struct nfacct_pluginstance *) upi->private;
okey_set_ptr(&ret[ULOGD_NFACCT_NAME],
(void *)nfacct_attr_get_str(nfacct, NFACCT_ATTR_NAME));
@@ -95,6 +116,11 @@ propagate_nfacct(struct ulogd_pluginstance *upi, struct nfacct *nfacct)
nfacct_attr_get_u64(nfacct, NFACCT_ATTR_BYTES));
okey_set_ptr(&ret[ULOGD_NFACCT_RAW], nfacct);
+ if (timestamp_ce(upi->config_kset).u.value != 0) {
+ okey_set_u32(&ret[ULOGD_NFACCT_TIME_SEC], cpi->tv.tv_sec);
+ okey_set_u32(&ret[ULOGD_NFACCT_TIME_USEC], cpi->tv.tv_usec);
+ }
+
ulogd_propagate_results(upi);
}
@@ -172,6 +198,10 @@ static int nfacct_send_request(struct ulogd_pluginstance *upi)
ulogd_log(ULOGD_ERROR, "Cannot send netlink message\n");
return -1;
}
+ if (timestamp_ce(upi->config_kset).u.value != 0) {
+ /* Compute time of query */
+ gettimeofday(&cpi->tv, NULL);
+ }
return 0;
}