diff options
| author | Jeremy Sowden <jeremy@azazel.net> | 2025-05-26 18:19:03 +0100 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2025-06-01 14:12:47 +0200 |
| commit | f699ba550c9f009924d8f5f59a190254938f9bec (patch) | |
| tree | 76fe196beb718881d6b7d16c64d86f47189a5260 /input/flow/ulogd_inpflow_NFCT.c | |
| parent | c0f9d1950e0968688558c2abbaa41cffd03f19de (diff) | |
Use `NFPROTO_*` constants for protocol families
Netfilter has a set of `NFPROTO_*` constants for the protocol families that it
supports, in part because it supports protocols and pseudo-protocols that do not
have `PF_*` (and `AF_*`) constants. Currently, ulogd uses `AF_*` constants for
protocol families, because it does not support any families which do not have
`AF_*` constants. Switch to `NFPROTO_*` constants instead, so we can add ARP
support later.
In the IP2* filters, retain `AF_*` for address family variables.
Remove a stray semicolon.
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'input/flow/ulogd_inpflow_NFCT.c')
| -rw-r--r-- | input/flow/ulogd_inpflow_NFCT.c | 23 |
1 files changed, 12 insertions, 11 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], |