diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-09-26 16:20:08 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-10-04 02:13:58 +0200 |
commit | 12c362e2214a04786a68a8effc2e9580833b1586 (patch) | |
tree | 9ed51fa3362a36bfb6dd03c186c6bad1982da39a /src/rule.c | |
parent | 0562beb6544d3fdb897870a10d9925eab40ac73a (diff) |
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 <pablo@netfilter.org>
Diffstat (limited to 'src/rule.c')
-rw-r--r-- | src/rule.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -21,6 +21,7 @@ #include <utils.h> #include <netdb.h> #include <netlink.h> +#include <mnl.h> #include <json.h> #include <libnftnl/common.h> @@ -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); } |