From 10da57e36147bf5c73cd2820e11ec124ecfffc83 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Thu, 25 Apr 2019 14:56:54 +0200 Subject: 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 Signed-off-by: Pablo Neira Ayuso --- src/monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/monitor.c') diff --git a/src/monitor.c b/src/monitor.c index 35dc4501..a68d960b 100644 --- a/src/monitor.c +++ b/src/monitor.c @@ -332,7 +332,7 @@ static bool set_elem_is_open_interval(struct expr *elem) { switch (elem->etype) { case EXPR_SET_ELEM: - return elem->elem_flags & SET_ELEM_F_INTERVAL_OPEN; + return elem->elem_flags & NFTNL_SET_ELEM_F_INTERVAL_OPEN; case EXPR_MAPPING: return set_elem_is_open_interval(elem->left); default: -- cgit v1.2.3