From 12c362e2214a04786a68a8effc2e9580833b1586 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Wed, 26 Sep 2018 16:20:08 +0200 Subject: mnl: remove alloc_nftnl_table() The netlink layer sits in between the mnl and the rule layers, remove it. We can remove alloc_nftnl_table() and consolidate infrastructure in the src/mnl.c file. Signed-off-by: Pablo Neira Ayuso --- src/rule.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/rule.c') diff --git a/src/rule.c b/src/rule.c index 32b13b19..81d5c3e9 100644 --- a/src/rule.c +++ b/src/rule.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -1409,7 +1410,7 @@ 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_batch(ctx, cmd, flags); + return mnl_nft_table_add(ctx, cmd, flags); case CMD_OBJ_CHAIN: return netlink_add_chain_batch(ctx, cmd, flags); case CMD_OBJ_RULE: @@ -1492,7 +1493,7 @@ static int do_command_delete(struct netlink_ctx *ctx, struct cmd *cmd) { switch (cmd->obj) { case CMD_OBJ_TABLE: - return netlink_delete_table_batch(ctx, cmd); + return mnl_nft_table_del(ctx, cmd); case CMD_OBJ_CHAIN: return netlink_delete_chain_batch(ctx, cmd); case CMD_OBJ_RULE: @@ -2267,7 +2268,7 @@ static int do_command_flush(struct netlink_ctx *ctx, struct cmd *cmd) case CMD_OBJ_METER: return netlink_flush_setelems(ctx, cmd); case CMD_OBJ_RULESET: - return netlink_flush_ruleset(ctx, cmd); + return mnl_nft_table_del(ctx, cmd); default: BUG("invalid command object type %u\n", cmd->obj); } -- cgit v1.2.3