From 590610d45983d48bc84adc7901e6e49628dab3c9 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Fri, 31 Aug 2018 16:16:40 +0200 Subject: obj: ct_timeout: use fixed size array Use an internal array and expose maximum size so we can just use the same array size for all protocol timeouts. This simplifies handling a bit and we don't need to set NFTNL_OBJ_CT_TIMEOUT_L4PROTO in first place. Signed-off-by: Pablo Neira Ayuso --- include/libnftnl/object.h | 2 ++ include/obj.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/libnftnl/object.h b/include/libnftnl/object.h index e846698..0279705 100644 --- a/include/libnftnl/object.h +++ b/include/libnftnl/object.h @@ -62,6 +62,8 @@ enum nftnl_cttimeout_array_udp { NFTNL_CTTIMEOUT_UDP_MAX }; +#define NFTNL_CTTIMEOUT_ARRAY_MAX NFTNL_CTTIMEOUT_TCP_MAX + enum { NFTNL_OBJ_CT_TIMEOUT_L3PROTO = NFTNL_OBJ_BASE, NFTNL_OBJ_CT_TIMEOUT_L4PROTO, diff --git a/include/obj.h b/include/obj.h index 837a54a..dfdbb73 100644 --- a/include/obj.h +++ b/include/obj.h @@ -39,7 +39,7 @@ struct nftnl_obj { struct nftnl_obj_ct_timeout { uint16_t l3proto; uint8_t l4proto; - uint32_t *timeout; + uint32_t timeout[NFTNL_CTTIMEOUT_ARRAY_MAX]; } ct_timeout; struct nftnl_obj_limit { uint64_t rate; -- cgit v1.2.3