diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-05-03 12:31:48 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-05-06 22:48:30 +0200 |
| commit | 12d57b50dfe50353a2a0d6b40dd5ff45530dd5cc (patch) | |
| tree | cfee10ca96072fc9ba16e8ff57340e718c304a62 /src/netlink_linearize.c | |
| parent | f2be4af9094d47dbd9c028e02ceb8b9d16cd4c02 (diff) | |
src: add set_spec
Store location object in handle to improve error reporting.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/netlink_linearize.c')
| -rw-r--r-- | src/netlink_linearize.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/netlink_linearize.c b/src/netlink_linearize.c index 6c49969b..2ab8accf 100644 --- a/src/netlink_linearize.c +++ b/src/netlink_linearize.c @@ -265,7 +265,7 @@ static void netlink_gen_map(struct netlink_linearize_ctx *ctx, netlink_put_register(nle, NFTNL_EXPR_LOOKUP_SREG, sreg); netlink_put_register(nle, NFTNL_EXPR_LOOKUP_DREG, dreg); nftnl_expr_set_str(nle, NFTNL_EXPR_LOOKUP_SET, - expr->mappings->set->handle.set); + expr->mappings->set->handle.set.name); nftnl_expr_set_u32(nle, NFTNL_EXPR_LOOKUP_SET_ID, expr->mappings->set->handle.set_id); @@ -291,7 +291,7 @@ static void netlink_gen_lookup(struct netlink_linearize_ctx *ctx, nle = alloc_nft_expr("lookup"); netlink_put_register(nle, NFTNL_EXPR_LOOKUP_SREG, sreg); nftnl_expr_set_str(nle, NFTNL_EXPR_LOOKUP_SET, - expr->right->set->handle.set); + expr->right->set->handle.set.name); nftnl_expr_set_u32(nle, NFTNL_EXPR_LOOKUP_SET_ID, expr->right->set->handle.set_id); if (expr->op == OP_NEQ) @@ -716,7 +716,7 @@ static void netlink_gen_objref_stmt(struct netlink_linearize_ctx *ctx, nftnl_expr_set_u32(nle, NFTNL_EXPR_OBJREF_SET_SREG, sreg_key); nftnl_expr_set_str(nle, NFTNL_EXPR_OBJREF_SET_NAME, - expr->mappings->set->handle.set); + expr->mappings->set->handle.set.name); nftnl_expr_set_u32(nle, NFTNL_EXPR_OBJREF_SET_ID, expr->mappings->set->handle.set_id); break; @@ -1172,7 +1172,7 @@ static void netlink_gen_set_stmt(struct netlink_linearize_ctx *ctx, nftnl_expr_set_u64(nle, NFTNL_EXPR_DYNSET_TIMEOUT, stmt->set.key->timeout); nftnl_expr_set_u32(nle, NFTNL_EXPR_DYNSET_OP, stmt->set.op); - nftnl_expr_set_str(nle, NFTNL_EXPR_DYNSET_SET_NAME, set->handle.set); + nftnl_expr_set_str(nle, NFTNL_EXPR_DYNSET_SET_NAME, set->handle.set.name); nftnl_expr_set_u32(nle, NFTNL_EXPR_DYNSET_SET_ID, set->handle.set_id); nftnl_rule_add_expr(ctx->nlr, nle); } @@ -1228,7 +1228,7 @@ static void netlink_gen_meter_stmt(struct netlink_linearize_ctx *ctx, nftnl_expr_set_u64(nle, NFTNL_EXPR_DYNSET_TIMEOUT, stmt->meter.key->timeout); nftnl_expr_set_u32(nle, NFTNL_EXPR_DYNSET_OP, op); - nftnl_expr_set_str(nle, NFTNL_EXPR_DYNSET_SET_NAME, set->handle.set); + nftnl_expr_set_str(nle, NFTNL_EXPR_DYNSET_SET_NAME, set->handle.set.name); nftnl_expr_set_u32(nle, NFTNL_EXPR_DYNSET_SET_ID, set->handle.set_id); nftnl_expr_set(nle, NFTNL_EXPR_DYNSET_EXPR, netlink_gen_stmt_stateful(ctx, stmt->meter.stmt), 0); |