From cc8c5fd02448a415473e1afc3f7155bed3940e0d Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sat, 3 Mar 2018 10:18:33 +0100 Subject: netlink: remove non-batching routines This is only needed by 3.16, which was released 8 months after nftables was merged upstream. That kernel version supports a reduced featureset. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Florian Westphal --- src/rule.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'src/rule.c') diff --git a/src/rule.c b/src/rule.c index a53908f6..c0b42b1c 100644 --- a/src/rule.c +++ b/src/rule.c @@ -999,7 +999,7 @@ static int __do_add_setelems(struct netlink_ctx *ctx, const struct handle *h, struct set *set, struct expr *expr, uint32_t flags) { expr->set_flags |= set->flags; - if (netlink_add_setelems(ctx, h, expr, flags) < 0) + if (netlink_add_setelems_batch(ctx, h, expr, flags) < 0) return -1; return 0; @@ -1031,7 +1031,7 @@ static int do_add_set(struct netlink_ctx *ctx, const struct handle *h, ctx->debug_mask, set->automerge) < 0) return -1; } - if (netlink_add_set(ctx, h, set, flags) < 0) + if (netlink_add_set_batch(ctx, h, set, flags) < 0) return -1; if (set->init != NULL) { return __do_add_setelems(ctx, &set->handle, set, set->init, @@ -1057,11 +1057,13 @@ static int do_command_add(struct netlink_ctx *ctx, struct cmd *cmd, bool excl) switch (cmd->obj) { case CMD_OBJ_TABLE: - return netlink_add_table(ctx, &cmd->handle, &cmd->location, - cmd->table, flags); + return netlink_add_table_batch(ctx, &cmd->handle, + &cmd->location, cmd->table, + flags); case CMD_OBJ_CHAIN: - return netlink_add_chain(ctx, &cmd->handle, &cmd->location, - cmd->chain, flags); + return netlink_add_chain_batch(ctx, &cmd->handle, + &cmd->location, cmd->chain, + flags); case CMD_OBJ_RULE: return netlink_add_rule_batch(ctx, &cmd->handle, cmd->rule, flags | NLM_F_APPEND); @@ -1131,7 +1133,7 @@ static int do_delete_setelems(struct netlink_ctx *ctx, const struct handle *h, ctx->debug_mask, set->automerge) < 0) return -1; - if (netlink_delete_setelems(ctx, h, expr) < 0) + if (netlink_delete_setelems_batch(ctx, h, expr) < 0) return -1; return 0; @@ -1141,14 +1143,14 @@ static int do_command_delete(struct netlink_ctx *ctx, struct cmd *cmd) { switch (cmd->obj) { case CMD_OBJ_TABLE: - return netlink_delete_table(ctx, &cmd->handle, &cmd->location); + return netlink_delete_table_batch(ctx, &cmd->handle, &cmd->location); case CMD_OBJ_CHAIN: - return netlink_delete_chain(ctx, &cmd->handle, &cmd->location); + return netlink_delete_chain_batch(ctx, &cmd->handle, &cmd->location); case CMD_OBJ_RULE: return netlink_del_rule_batch(ctx, &cmd->handle, &cmd->location); case CMD_OBJ_SET: - return netlink_delete_set(ctx, &cmd->handle, &cmd->location); + return netlink_delete_set_batch(ctx, &cmd->handle, &cmd->location); case CMD_OBJ_SETELEM: return do_delete_setelems(ctx, &cmd->handle, cmd->expr); case CMD_OBJ_COUNTER: @@ -1714,7 +1716,7 @@ static int do_command_rename(struct netlink_ctx *ctx, struct cmd *cmd) case CMD_OBJ_CHAIN: chain = chain_lookup(table, &cmd->handle); - return netlink_rename_chain(ctx, &chain->handle, &cmd->location, + return netlink_rename_chain_batch(ctx, &chain->handle, &cmd->location, cmd->arg); default: BUG("invalid command object type %u\n", cmd->obj); -- cgit v1.2.3