summaryrefslogtreecommitdiffstats
path: root/output
diff options
context:
space:
mode:
Diffstat (limited to 'output')
-rw-r--r--output/pcap/ulogd_output_PCAP.c4
-rw-r--r--output/ulogd_output_ASTARO.c2
-rw-r--r--output/ulogd_output_IPFIX.c4
-rw-r--r--output/ulogd_output_LOGEMU.c4
-rw-r--r--output/ulogd_output_SYSLOG.c2
5 files changed, 8 insertions, 8 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)
{
diff --git a/output/ulogd_output_ASTARO.c b/output/ulogd_output_ASTARO.c
index 08e7789..d4dea45 100644
--- a/output/ulogd_output_ASTARO.c
+++ b/output/ulogd_output_ASTARO.c
@@ -319,7 +319,7 @@ print_key(char *buf, size_t len, const struct ulogd_key *key,
strcpy(pch, name), pch += strlen(name);
strcpy(pch, "=\""), pch += sizeof("=\"") - 1;
- pch += ulogd_value_to_ascii(&key_src(key)->u.val, pch, end - pch);
+ pch += ulogd_value_to_ascii(&key_src(key)->val, pch, end - pch);
strcpy(pch, "\" "), pch += sizeof("\" ") - 1;
return pch - buf;
diff --git a/output/ulogd_output_IPFIX.c b/output/ulogd_output_IPFIX.c
index adcb426..3e15cc1 100644
--- a/output/ulogd_output_IPFIX.c
+++ b/output/ulogd_output_IPFIX.c
@@ -237,7 +237,7 @@ build_template_for_bitmask(struct ulogd_pluginstance *upi,
struct ulogd_key *key = &upi->input.keys[i];
int length = ulogd_key_size(key);
- if (!(key->u.source->flags & ULOGD_RETF_VALID))
+ if (!(key->source->flags & ULOGD_RETF_VALID))
continue;
if (length < 0 || length > 0xfffe) {
@@ -310,7 +310,7 @@ static int output_ipfix(struct ulogd_pluginstance *upi, unsigned *flags)
bitmask_clear(ii->valid_bitmask);
for (i = 0; i < upi->input.num_keys; i++) {
- struct ulogd_key *key = upi->input.keys[i].u.source;
+ struct ulogd_key *key = upi->input.keys[i].source;
if (key->flags & ULOGD_RETF_VALID)
bitmask_set_bit(ii->valid_bitmask, i);
diff --git a/output/ulogd_output_LOGEMU.c b/output/ulogd_output_LOGEMU.c
index f82b10d..efcb5d3 100644
--- a/output/ulogd_output_LOGEMU.c
+++ b/output/ulogd_output_LOGEMU.c
@@ -78,12 +78,12 @@ static int _output_logemu(struct ulogd_pluginstance *upi, unsigned *flags)
struct logemu_instance *li = upi_priv(upi);
struct ulogd_key *res = upi->input.keys;
- if (res[0].u.source->flags & ULOGD_RETF_VALID) {
+ if (res[0].source->flags & ULOGD_RETF_VALID) {
char *timestr;
char *tmp;
time_t now;
- if (res[1].u.source && (res[1].u.source->flags & ULOGD_RETF_VALID))
+ if (res[1].source && (res[1].source->flags & ULOGD_RETF_VALID))
now = (time_t) key_src_u32(&res[1]);
else
now = time(NULL);
diff --git a/output/ulogd_output_SYSLOG.c b/output/ulogd_output_SYSLOG.c
index eed5b2f..591391b 100644
--- a/output/ulogd_output_SYSLOG.c
+++ b/output/ulogd_output_SYSLOG.c
@@ -51,7 +51,7 @@ static int syslog_interp(struct ulogd_pluginstance *upi, unsigned *flags)
struct syslog_instance *li = upi_priv(upi);
struct ulogd_key *res = upi->input.keys;
- if (res[0].u.source->flags & ULOGD_RETF_VALID)
+ if (res[0].source->flags & ULOGD_RETF_VALID)
syslog(li->level | li->facility, "%s", key_str(&res[0]));
return 0;