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 /src/segtree.c | |
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 'src/segtree.c')
-rw-r--r-- | src/segtree.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/segtree.c b/src/segtree.c index 4353e85a..a21270a0 100644 --- a/src/segtree.c +++ b/src/segtree.c @@ -13,6 +13,8 @@ #include <inttypes.h> #include <arpa/inet.h> +#include <libnftnl/udata.h> + #include <rule.h> #include <expression.h> #include <gmputil.h> @@ -562,7 +564,7 @@ static void set_insert_interval(struct expr *set, struct seg_tree *tree, if (ei->flags & EI_F_INTERVAL_END) expr->flags |= EXPR_F_INTERVAL_END; if (ei->flags & EI_F_INTERVAL_OPEN) - expr->elem_flags |= SET_ELEM_F_INTERVAL_OPEN; + expr->elem_flags |= NFTNL_SET_ELEM_F_INTERVAL_OPEN; compound_expr_add(set, expr); } |