From 0e75d6dba81445f611b03b0157322c003fcdb8e2 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sun, 17 Jan 2010 22:34:06 +0100 Subject: output: add new plugin XML to output logs in XML This patch adds XML that allows to log information in XML for ulogd2. It supports packet and flow-based accounting. Signed-off-by: Pablo Neira Ayuso --- input/packet/ulogd_inppkt_NFLOG.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'input/packet') diff --git a/input/packet/ulogd_inppkt_NFLOG.c b/input/packet/ulogd_inppkt_NFLOG.c index 3fd866e..7e2f5a4 100644 --- a/input/packet/ulogd_inppkt_NFLOG.c +++ b/input/packet/ulogd_inppkt_NFLOG.c @@ -138,6 +138,7 @@ enum nflog_keys { NFLOG_KEY_RAW_TYPE, NFLOG_KEY_RAW_MAC_SADDR, NFLOG_KEY_RAW_MAC_ADDRLEN, + NFLOG_KEY_RAW, }; static struct ulogd_key output_keys[] = { @@ -304,7 +305,11 @@ static struct ulogd_key output_keys[] = { .flags = ULOGD_RETF_NONE, .name = "raw.type", }, - + [NFLOG_KEY_RAW] = { + .type = ULOGD_RET_RAW, + .flags = ULOGD_RETF_NONE, + .name = "raw", + }, }; static inline int @@ -390,6 +395,8 @@ interp_packet(struct ulogd_pluginstance *upi, u_int8_t pf_family, if (nflog_get_seq_global(ldata, &seq) == 0) okey_set_u32(&ret[NFLOG_KEY_OOB_SEQ_GLOBAL], seq); + okey_set_ptr(&ret[NFLOG_KEY_RAW], ldata); + ulogd_propagate_results(upi); return 0; } -- cgit v1.2.3