Add required glue code to support family specific lookup expression parsers implemented as family_ops callback. Signed-off-by: Phil Sutter <phil@xxxxxx> --- Changes since v2: - Remove call to add_nft_among() which is implemented in next patch to not temporarily break builds. --- iptables/nft-shared.c | 9 +++++++++ iptables/nft-shared.h | 2 ++ iptables/nft.c | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/iptables/nft-shared.c b/iptables/nft-shared.c index 19630c1e2990c..78e422781723f 100644 --- a/iptables/nft-shared.c +++ b/iptables/nft-shared.c @@ -588,6 +588,13 @@ static void nft_parse_limit(struct nft_xt_ctx *ctx, struct nftnl_expr *e) ctx->h->ops->parse_match(match, ctx->cs); } +static void nft_parse_lookup(struct nft_xt_ctx *ctx, struct nft_handle *h, + struct nftnl_expr *e) +{ + if (ctx->h->ops->parse_lookup) + ctx->h->ops->parse_lookup(ctx, e, NULL); +} + void nft_rule_to_iptables_command_state(struct nft_handle *h, const struct nftnl_rule *r, struct iptables_command_state *cs) @@ -628,6 +635,8 @@ void nft_rule_to_iptables_command_state(struct nft_handle *h, nft_parse_target(&ctx, expr); else if (strcmp(name, "limit") == 0) nft_parse_limit(&ctx, expr); + else if (strcmp(name, "lookup") == 0) + nft_parse_lookup(&ctx, h, expr); expr = nftnl_expr_iter_next(iter); } diff --git a/iptables/nft-shared.h b/iptables/nft-shared.h index 0519749f43cd8..b83d148a14dc2 100644 --- a/iptables/nft-shared.h +++ b/iptables/nft-shared.h @@ -86,6 +86,8 @@ struct nft_family_ops { void *data); void (*parse_cmp)(struct nft_xt_ctx *ctx, struct nftnl_expr *e, void *data); + void (*parse_lookup)(struct nft_xt_ctx *ctx, struct nftnl_expr *e, + void *data); void (*parse_immediate)(const char *jumpto, bool nft_goto, void *data); void (*print_table_header)(const char *tablename); diff --git a/iptables/nft.c b/iptables/nft.c index fbb3e2f2a0f4a..111d4982b1181 100644 --- a/iptables/nft.c +++ b/iptables/nft.c @@ -3073,7 +3073,8 @@ static const char *supported_exprs[] = { "cmp", "bitwise", "counter", - "immediate" + "immediate", + "lookup", }; -- 2.23.0