diff options
author | Phil Sutter <phil@nwl.cc> | 2019-04-25 14:56:54 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-05-03 20:02:45 +0200 |
commit | 10da57e36147bf5c73cd2820e11ec124ecfffc83 (patch) | |
tree | bc92463a0dcdd81a0b82acd8914b43abcc67ab7d /include | |
parent | 92591aa0da84821238107f2f1515a57cbbd2cf6a (diff) |
src: use UDATA defines from libnftnl
Userdata attribute names have been added to libnftnl, use them instead
of the local copy.
While being at it, rename udata_get_comment() in netlink_delinearize.c
and the callback it uses since the function is specific to rules. Also
integrate the existence check for NFTNL_RULE_USERDATA into it along with
the call to nftnl_rule_get_data().
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/rule.h | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/include/rule.h b/include/rule.h index dc5e5b87..8e70c129 100644 --- a/include/rule.h +++ b/include/rule.h @@ -637,38 +637,6 @@ extern void cache_flush(struct nft_ctx *ctx, enum cmd_ops cmd, struct list_head *msgs); extern void cache_release(struct nft_cache *cache); -enum udata_type { - UDATA_TYPE_COMMENT, - __UDATA_TYPE_MAX, -}; -#define UDATA_TYPE_MAX (__UDATA_TYPE_MAX - 1) - -#define UDATA_COMMENT_MAXLEN 128 - -enum udata_set_type { - UDATA_SET_KEYBYTEORDER, - UDATA_SET_DATABYTEORDER, - UDATA_SET_MERGE_ELEMENTS, - __UDATA_SET_MAX, -}; -#define UDATA_SET_MAX (__UDATA_SET_MAX - 1) - -enum udata_set_elem_type { - UDATA_SET_ELEM_COMMENT, - UDATA_SET_ELEM_FLAGS, - __UDATA_SET_ELEM_MAX, -}; -#define UDATA_SET_ELEM_MAX (__UDATA_SET_ELEM_MAX - 1) - -/** - * enum udata_set_elem_flags - meaning of bits in UDATA_SET_ELEM_FLAGS - * - * @SET_ELEM_F_INTERVAL_OPEN: set element denotes a half-open range - */ -enum udata_set_elem_flags { - SET_ELEM_F_INTERVAL_OPEN = 0x1, -}; - struct timeout_protocol { uint32_t array_size; const char *const *state_to_name; |