diff options
Diffstat (limited to 'input')
| -rw-r--r-- | input/flow/ulogd_inpflow_NFCT.c | 23 | ||||
| -rw-r--r-- | input/packet/ulogd_inppkt_UNIXSOCK.c | 7 |
2 files changed, 16 insertions, 14 deletions
diff --git a/input/flow/ulogd_inpflow_NFCT.c b/input/flow/ulogd_inpflow_NFCT.c index 8746b88..82dc83a 100644 --- a/input/flow/ulogd_inpflow_NFCT.c +++ b/input/flow/ulogd_inpflow_NFCT.c @@ -48,6 +48,7 @@ #include <ulogd/namespace.h> #include <libnetfilter_conntrack/libnetfilter_conntrack.h> +#include <linux/netfilter.h> #ifndef NSEC_PER_SEC #define NSEC_PER_SEC 1000000000L @@ -491,14 +492,14 @@ static uint32_t hash(const void *data, const struct hashtable *table) const struct nf_conntrack *ct = data; switch(nfct_get_attr_u8(ct, ATTR_L3PROTO)) { - case AF_INET: - ret = __hash4(ct, table); - break; - case AF_INET6: - ret = __hash6(ct, table); - break; - default: - break; + case NFPROTO_IPV4: + ret = __hash4(ct, table); + break; + case NFPROTO_IPV6: + ret = __hash6(ct, table); + break; + default: + break; } return ret; @@ -528,7 +529,7 @@ static int propagate_ct(struct ulogd_pluginstance *main_upi, okey_set_u8(&ret[NFCT_OOB_PROTOCOL], 0); /* FIXME */ switch (nfct_get_attr_u8(ct, ATTR_L3PROTO)) { - case AF_INET: + case NFPROTO_IPV4: okey_set_u32(&ret[NFCT_ORIG_IP_SADDR], nfct_get_attr_u32(ct, ATTR_ORIG_IPV4_SRC)); okey_set_u32(&ret[NFCT_ORIG_IP_DADDR], @@ -538,7 +539,7 @@ static int propagate_ct(struct ulogd_pluginstance *main_upi, okey_set_u32(&ret[NFCT_REPLY_IP_DADDR], nfct_get_attr_u32(ct, ATTR_REPL_IPV4_DST)); break; - case AF_INET6: + case NFPROTO_IPV6: okey_set_u128(&ret[NFCT_ORIG_IP_SADDR], nfct_get_attr(ct, ATTR_ORIG_IPV6_SRC)); okey_set_u128(&ret[NFCT_ORIG_IP_DADDR], @@ -549,7 +550,7 @@ static int propagate_ct(struct ulogd_pluginstance *main_upi, nfct_get_attr(ct, ATTR_REPL_IPV6_DST)); break; default: - ulogd_log(ULOGD_NOTICE, "Unknown protocol family (%d)\n", + ulogd_log(ULOGD_NOTICE, "Unexpected protocol family (%d)\n", nfct_get_attr_u8(ct, ATTR_L3PROTO)); } okey_set_u8(&ret[NFCT_ORIG_IP_PROTOCOL], diff --git a/input/packet/ulogd_inppkt_UNIXSOCK.c b/input/packet/ulogd_inppkt_UNIXSOCK.c index 0d9ba60..bed5ccc 100644 --- a/input/packet/ulogd_inppkt_UNIXSOCK.c +++ b/input/packet/ulogd_inppkt_UNIXSOCK.c @@ -32,6 +32,7 @@ #include <pwd.h> #include <grp.h> #include <errno.h> +#include <linux/netfilter.h> #include <ulogd/ulogd.h> @@ -388,11 +389,11 @@ static int handle_packet(struct ulogd_pluginstance *upi, struct ulogd_unixsock_p payload_len = ntohs(pkt->payload_length); if (ip_version == 4) - oob_family = AF_INET; + oob_family = NFPROTO_IPV4; else if (ip_version == 6) - oob_family = AF_INET6; + oob_family = NFPROTO_IPV6; else - oob_family = 0; + oob_family = NFPROTO_UNSPEC; okey_set_u8(&ret[UNIXSOCK_KEY_OOB_FAMILY], oob_family); okey_set_ptr(&ret[UNIXSOCK_KEY_RAW_PCKT], &pkt->payload); |