From: Sven Auhagen Date: Sat, 26 Oct 2019 11:17:21 +0000 (+0200) Subject: mnl: remove artifical cap on 8 devices per flowtable X-Git-Tag: v0.9.3~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1698fca7d49fff4b7c8752cc4f3f18cfe73a6aaf;p=thirdparty%2Fnftables.git mnl: remove artifical cap on 8 devices per flowtable Currently assuming a maximum of 8 devices, remove this artificial cap. Signed-off-by: Sven Auhagen Signed-off-by: Pablo Neira Ayuso --- diff --git a/src/mnl.c b/src/mnl.c index 492381da..960c5574 100644 --- a/src/mnl.c +++ b/src/mnl.c @@ -1411,11 +1411,11 @@ int mnl_nft_flowtable_add(struct netlink_ctx *ctx, const struct cmd *cmd, unsigned int flags) { struct nftnl_flowtable *flo; - const char *dev_array[8]; + const char **dev_array; struct nlmsghdr *nlh; + int i = 0, len = 1; struct expr *expr; int priority; - int i = 0; flo = nftnl_flowtable_alloc(); if (!flo) @@ -1433,11 +1433,16 @@ int mnl_nft_flowtable_add(struct netlink_ctx *ctx, const struct cmd *cmd, BYTEORDER_HOST_ENDIAN, sizeof(int)); nftnl_flowtable_set_u32(flo, NFTNL_FLOWTABLE_PRIO, priority); + list_for_each_entry(expr, &cmd->flowtable->dev_expr->expressions, list) + len++; + + dev_array = calloc(len, sizeof(char *)); list_for_each_entry(expr, &cmd->flowtable->dev_expr->expressions, list) dev_array[i++] = expr->identifier; dev_array[i] = NULL; nftnl_flowtable_set(flo, NFTNL_FLOWTABLE_DEVICES, dev_array); + free(dev_array); netlink_dump_flowtable(flo, ctx);