summaryrefslogtreecommitdiffstats
path: root/output/pcap/ulogd_output_PCAP.c
diff options
context:
space:
mode:
authorHolger Eitzenberger <heitzenberger@astaro.com>2009-10-08 22:20:02 +0200
committerHarald Welte <laforge@gnumonks.org>2010-10-21 19:15:36 +0200
commiteeef45a47330a67fadb155c9fec985da98305215 (patch)
treef176f3c6cd7b673a95c95533e4b720254b14dbd4 /output/pcap/ulogd_output_PCAP.c
parent05d28f46d0ff183615b6af29735d6bfc4df909aa (diff)
Fix key check by removing key.source overlay
The key check failed after introducing ulogd_key and more importantly by moving key.type to ulogd_value. Because of the overlay of key.u.source and key.u.val this broke the key check in stack_resolve_keys(), because the value.type was already set then. Fix it by removing this overlay (remove that union). This increases the ulogd_key size by 4 bytes, which is not a problem at all. Signed-off-by: Holger Eitzenberger <holger@eitzenberger.org>
Diffstat (limited to 'output/pcap/ulogd_output_PCAP.c')
-rw-r--r--output/pcap/ulogd_output_PCAP.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/output/pcap/ulogd_output_PCAP.c b/output/pcap/ulogd_output_PCAP.c
index a4b5f77..133c541 100644
--- a/output/pcap/ulogd_output_PCAP.c
+++ b/output/pcap/ulogd_output_PCAP.c
@@ -121,8 +121,8 @@ static struct ulogd_key pcap_keys[INTR_IDS] = {
{ .name = "oob.time.usec" },
};
-#define GET_VALUE(res, x) (res[x].u.source->u.val)
-#define GET_FLAGS(res, x) (res[x].u.source->flags)
+#define GET_VALUE(res, x) (res[x].source->val)
+#define GET_FLAGS(res, x) (res[x].source->flags)
static int interp_pcap(struct ulogd_pluginstance *upi, unsigned *flags)
{