summaryrefslogtreecommitdiffstats
path: root/input/packet
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2010-01-17 22:34:06 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2010-06-17 12:56:04 +0200
commit0e75d6dba81445f611b03b0157322c003fcdb8e2 (patch)
tree0fe0a5d815dfe5cfd6163ea18ebd20e420978391 /input/packet
parent7338886bd4248ac360d7632962e5b8f363c40fdc (diff)
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 <pablo@netfilter.org>
Diffstat (limited to 'input/packet')
-rw-r--r--input/packet/ulogd_inppkt_NFLOG.c9
1 files changed, 8 insertions, 1 deletions
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;
}