All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH nft] xt: use NFTNL_* definitions
@ 2016-12-20 13:08 Pablo Neira Ayuso
  0 siblings, 0 replies; only message in thread
From: Pablo Neira Ayuso @ 2016-12-20 13:08 UTC (permalink / raw)
  To: netfilter-devel

Do not use obsolete definitions in libnftnl.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 src/xt.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/xt.c b/src/xt.c
index c4b76c731bef..e24b0af05bab 100644
--- a/src/xt.c
+++ b/src/xt.c
@@ -201,19 +201,19 @@ void netlink_parse_match(struct netlink_parse_ctx *ctx,
 
 	xtables_set_nfproto(ctx->table->handle.family);
 
-	name = nftnl_expr_get_str(nle, NFT_EXPR_MT_NAME);
+	name = nftnl_expr_get_str(nle, NFTNL_EXPR_MT_NAME);
 
 	mt = xtables_find_match(name, XTF_TRY_LOAD, NULL);
 	if (!mt)
 		BUG("XT match %s not found\n", name);
 
-	mtinfo = nftnl_expr_get(nle, NFT_EXPR_MT_INFO, &mt_len);
+	mtinfo = nftnl_expr_get(nle, NFTNL_EXPR_MT_INFO, &mt_len);
 
 	m = xzalloc(sizeof(struct xt_entry_match) + mt_len);
 	memcpy(&m->data, mtinfo, mt_len);
 
 	m->u.match_size = mt_len + XT_ALIGN(sizeof(struct xt_entry_match));
-	m->u.user.revision = nftnl_expr_get_u32(nle, NFT_EXPR_MT_REV);
+	m->u.user.revision = nftnl_expr_get_u32(nle, NFTNL_EXPR_MT_REV);
 
 	stmt = xt_stmt_alloc(loc);
 	stmt->xt.name = strdup(name);
@@ -238,18 +238,18 @@ void netlink_parse_target(struct netlink_parse_ctx *ctx,
 
 	xtables_set_nfproto(ctx->table->handle.family);
 
-	name = nftnl_expr_get_str(nle, NFT_EXPR_TG_NAME);
+	name = nftnl_expr_get_str(nle, NFTNL_EXPR_TG_NAME);
 	tg = xtables_find_target(name, XTF_TRY_LOAD);
 	if (!tg)
 		BUG("XT target %s not found\n", name);
 
-	tginfo = nftnl_expr_get(nle, NFT_EXPR_TG_INFO, &tg_len);
+	tginfo = nftnl_expr_get(nle, NFTNL_EXPR_TG_INFO, &tg_len);
 
 	size = XT_ALIGN(sizeof(struct xt_entry_target)) + tg_len;
 	t = xzalloc(size);
 	memcpy(&t->data, tginfo, tg_len);
 	t->u.target_size = size;
-	t->u.user.revision = nftnl_expr_get_u32(nle, NFT_EXPR_TG_REV);
+	t->u.user.revision = nftnl_expr_get_u32(nle, NFTNL_EXPR_TG_REV);
 	strcpy(t->u.user.name, tg->name);
 
 	stmt = xt_stmt_alloc(loc);
-- 
2.1.4


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2016-12-20 13:08 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-20 13:08 [PATCH nft] xt: use NFTNL_* definitions Pablo Neira Ayuso

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.