diff options
author | Máté Eckl <ecklm94@gmail.com> | 2018-05-29 01:11:44 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-05-29 01:14:30 +0200 |
commit | 005369151ed52631b0e495268737f6915977dc20 (patch) | |
tree | 2d447d0d9d3563bb557a57dfad7a704a8fd4af48 /src/expr | |
parent | 9ce30532e00cc3acab473a57da98bfcfdab33da6 (diff) |
include: updated nf_tables.h
Joint work with Pablo.
Signed-off-by: Máté Eckl <ecklm94@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/expr')
-rw-r--r-- | src/expr/ct.c | 6 | ||||
-rw-r--r-- | src/expr/rt.c | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/expr/ct.c b/src/expr/ct.c index d4dd1d9..39e9be6 100644 --- a/src/expr/ct.c +++ b/src/expr/ct.c @@ -31,10 +31,6 @@ struct nftnl_expr_ct { #define IP_CT_DIR_ORIGINAL 0 #define IP_CT_DIR_REPLY 1 -#ifndef NFT_CT_MAX -#define NFT_CT_MAX (NFT_CT_DST_IP6 + 1) -#endif - static int nftnl_expr_ct_set(struct nftnl_expr *e, uint16_t type, const void *data, uint32_t data_len) @@ -152,7 +148,7 @@ nftnl_expr_ct_parse(struct nftnl_expr *e, struct nlattr *attr) return 0; } -static const char *ctkey2str_array[NFT_CT_MAX] = { +static const char *ctkey2str_array[NFT_CT_MAX + 1] = { [NFT_CT_STATE] = "state", [NFT_CT_DIRECTION] = "direction", [NFT_CT_STATUS] = "status", diff --git a/src/expr/rt.c b/src/expr/rt.c index 62c01a0..ab56831 100644 --- a/src/expr/rt.c +++ b/src/expr/rt.c @@ -19,10 +19,6 @@ #include <libnftnl/expr.h> #include <libnftnl/rule.h> -#ifndef NFT_RT_MAX -#define NFT_RT_MAX (NFT_RT_TCPMSS + 1) -#endif - struct nftnl_expr_rt { enum nft_rt_keys key; enum nft_registers dreg; @@ -116,7 +112,7 @@ nftnl_expr_rt_parse(struct nftnl_expr *e, struct nlattr *attr) return 0; } -static const char *rt_key2str_array[NFT_RT_MAX] = { +static const char *rt_key2str_array[NFT_RT_MAX + 1] = { [NFT_RT_CLASSID] = "classid", [NFT_RT_NEXTHOP4] = "nexthop4", [NFT_RT_NEXTHOP6] = "nexthop6", |