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 060394b30329a8399128864a625ccf7ad946f8cd..293a81420a322550e8498a205b01985e48ee3f17 100644 (file)
--- 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 97c321b994fe512387da20bc6c6692c42d597abf..b5a1fef9f406409ed9150262ce7d68d3a16bd00d 100644 (file)
--- 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));
 }