From 325b7d44124f57674dcaa4088e67238996a5a03b Mon Sep 17 00:00:00 2001 From: "/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org" Date: Tue, 23 May 2006 09:00:01 +0000 Subject: Add a printflow plugin is similar to the PRINTPKT plugin, but for flows. It's output is compatible with the SYSLOG and LOGEMU plugins. (Philip Craig) --- output/ulogd_output_LOGEMU.c | 5 +++-- output/ulogd_output_SYSLOG.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'output') diff --git a/output/ulogd_output_LOGEMU.c b/output/ulogd_output_LOGEMU.c index a224d7b..c18aad7 100644 --- a/output/ulogd_output_LOGEMU.c +++ b/output/ulogd_output_LOGEMU.c @@ -55,6 +55,7 @@ static struct ulogd_key logemu_inp[] = { }, { .type = ULOGD_RET_UINT32, + .flags = ULOGD_KEYF_OPTIONAL, .name = "oob.time.sec", }, }; @@ -91,7 +92,7 @@ static int _output_logemu(struct ulogd_pluginstance *upi) char *tmp; time_t now; - if (res[1].u.source->flags & ULOGD_RETF_VALID) + if (res[1].u.source && (res[1].u.source->flags & ULOGD_RETF_VALID)) now = (time_t) res[1].u.source->u.value.ui32; else now = time(NULL); @@ -187,7 +188,7 @@ static struct ulogd_plugin logemu_plugin = { .input = { .keys = logemu_inp, .num_keys = ARRAY_SIZE(logemu_inp), - .type = ULOGD_DTYPE_PACKET, + .type = ULOGD_DTYPE_PACKET | ULOGD_DTYPE_FLOW, }, .output = { .type = ULOGD_DTYPE_SINK, diff --git a/output/ulogd_output_SYSLOG.c b/output/ulogd_output_SYSLOG.c index 8b89295..2959a29 100644 --- a/output/ulogd_output_SYSLOG.c +++ b/output/ulogd_output_SYSLOG.c @@ -163,7 +163,7 @@ static struct ulogd_plugin syslog_plugin = { .input = { .keys = syslog_inp, .num_keys = ARRAY_SIZE(syslog_inp), - .type = ULOGD_DTYPE_PACKET, + .type = ULOGD_DTYPE_PACKET | ULOGD_DTYPE_FLOW, }, .output = { .type = ULOGD_DTYPE_SINK, -- cgit v1.2.3