From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Sun, 23 Jun 2024 11:27:00 +0000 (+0200)
Subject: expr: use NFTA_* netlink attributes to build fields, not NFTNL_EXPR_*
X-Git-Tag: libnftnl-1.2.7~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d84846df1329c774a0a9e777d6c5adeb157b7499;p=thirdparty%2Flibnftnl.git

expr: use NFTA_* netlink attributes to build fields, not NFTNL_EXPR_*

Coincidentally NFTNL_EXPR_BASE starts at 1 which comes right after
NFTA_*_UNSPEC which is zero. And NFTNL_EXPR_ attribute values were
mapping to NFTA_* attributes.

Use NFTA_* for netlink attribute types instead.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/src/expr/osf.c b/src/expr/osf.c
index 060394b3..293a8142 100644
--- a/src/expr/osf.c
+++ b/src/expr/osf.c
@@ -89,12 +89,12 @@ nftnl_expr_osf_build(struct nlmsghdr *nlh, const struct nftnl_expr *e)
 	struct nftnl_expr_osf *osf = nftnl_expr_data(e);
 
 	if (e->flags & (1 << NFTNL_EXPR_OSF_DREG))
-		mnl_attr_put_u32(nlh, NFTNL_EXPR_OSF_DREG, htonl(osf->dreg));
+		mnl_attr_put_u32(nlh, NFTA_OSF_DREG, htonl(osf->dreg));
 	if (e->flags & (1 << NFTNL_EXPR_OSF_TTL))
-		mnl_attr_put_u8(nlh, NFTNL_EXPR_OSF_TTL, osf->ttl);
+		mnl_attr_put_u8(nlh, NFTA_OSF_TTL, osf->ttl);
 	if (e->flags & (1 << NFTNL_EXPR_OSF_FLAGS))
 		if (osf->flags)
-			mnl_attr_put_u32(nlh, NFTNL_EXPR_OSF_FLAGS, htonl(osf->flags));
+			mnl_attr_put_u32(nlh, NFTA_OSF_FLAGS, htonl(osf->flags));
 }
 
 static int
diff --git a/src/expr/synproxy.c b/src/expr/synproxy.c
index 97c321b9..b5a1fef9 100644
--- a/src/expr/synproxy.c
+++ b/src/expr/synproxy.c
@@ -90,13 +90,13 @@ nftnl_expr_synproxy_build(struct nlmsghdr *nlh, const struct nftnl_expr *e)
 	struct nftnl_expr_synproxy *synproxy = nftnl_expr_data(e);
 
 	if (e->flags & (1 << NFTNL_EXPR_SYNPROXY_MSS))
-		mnl_attr_put_u16(nlh, NFTNL_EXPR_SYNPROXY_MSS,
+		mnl_attr_put_u16(nlh, NFTA_SYNPROXY_MSS,
 				 htons(synproxy->mss));
 	if (e->flags & (1 << NFTNL_EXPR_SYNPROXY_WSCALE))
-		mnl_attr_put_u8(nlh, NFTNL_EXPR_SYNPROXY_WSCALE,
+		mnl_attr_put_u8(nlh, NFTA_SYNPROXY_WSCALE,
 				synproxy->wscale);
 	if (e->flags & (1 << NFTNL_EXPR_SYNPROXY_FLAGS))
-		mnl_attr_put_u32(nlh, NFTNL_EXPR_SYNPROXY_FLAGS,
+		mnl_attr_put_u32(nlh, NFTA_SYNPROXY_FLAGS,
 				 htonl(synproxy->flags));
 }