In commit [ff62959](set: add support for set mechanism selection) the
support for parsing the nested attribute (NFTA_SET_DESC) was invalid.
This patch address the issue.
Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@xxxxxxxxx>
---
src/set.c | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)
diff --git a/src/set.c b/src/set.c
index 3c38334..223ddec 100644
--- a/src/set.c
+++ b/src/set.c
@@ -340,7 +340,7 @@ static int nft_set_desc_parse_attr_cb(const struct nlattr *attr, void *data)
static int nft_set_desc_parse(struct nft_set *s,
const struct nlattr *attr)
{
- struct nlattr *tb[NFTA_SET_MAX+1] = {};
+ struct nlattr *tb[NFTA_SET_DESC_MAX + 1] = {};
if (mnl_attr_parse_nested(attr, nft_set_desc_parse_attr_cb, tb) < 0)
return -1;
@@ -353,24 +353,6 @@ static int nft_set_desc_parse(struct nft_set *s,
return 0;
}
-static int nft_set_nlmsg_desc_parse(const struct nlattr *nest,
- struct nft_set *s)
-{
- struct nlattr *attr;
- int ret = 0;
-
- mnl_attr_for_each_nested(attr, nest) {
- if (mnl_attr_get_type(attr) != NFTA_SET_DESC)
- return -1;
-
- ret = nft_set_desc_parse(s, attr);
- if (ret != 0)
- break;
- }
-
- return ret;
-}
-
int nft_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_set *s)
{
struct nlattr *tb[NFTA_SET_MAX+1] = {};
@@ -417,7 +399,7 @@ int nft_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_set *s)
s->flags |= (1 << NFT_SET_ATTR_POLICY);
}
if (tb[NFTA_SET_DESC])
- ret = nft_set_nlmsg_desc_parse(tb[NFTA_SET_DESC], s);
+ ret = nft_set_desc_parse(s, tb[NFTA_SET_DESC]);
s->family = nfg->nfgen_family;
s->flags |= (1 << NFT_SET_ATTR_FAMILY);
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
