From 79dd3eac447f00edbe9b4dfa9c9367e5303a8dd0 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 23 Oct 2018 18:59:07 +0200 Subject: mnl: remove alloc_nftnl_obj() We can remove alloc_nftnl_obj() and consolidate infrastructure in the src/mnl.c file. Signed-off-by: Pablo Neira Ayuso --- src/rule.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/rule.c') diff --git a/src/rule.c b/src/rule.c index 9087fd2b..718987dc 100644 --- a/src/rule.c +++ b/src/rule.c @@ -1415,7 +1415,7 @@ static int do_command_add(struct netlink_ctx *ctx, struct cmd *cmd, bool excl) case CMD_OBJ_CT_TIMEOUT: case CMD_OBJ_LIMIT: case CMD_OBJ_SECMARK: - return netlink_add_obj(ctx, cmd, flags); + return mnl_nft_obj_add(ctx, cmd, flags); case CMD_OBJ_FLOWTABLE: return netlink_add_flowtable(ctx, cmd, flags); default: @@ -1493,18 +1493,17 @@ static int do_command_delete(struct netlink_ctx *ctx, struct cmd *cmd) case CMD_OBJ_SETELEM: return do_delete_setelems(ctx, cmd); case CMD_OBJ_COUNTER: - return netlink_delete_obj(ctx, cmd, NFT_OBJECT_COUNTER); + return mnl_nft_obj_del(ctx, cmd, NFT_OBJECT_COUNTER); case CMD_OBJ_QUOTA: - return netlink_delete_obj(ctx, cmd, NFT_OBJECT_QUOTA); + return mnl_nft_obj_del(ctx, cmd, NFT_OBJECT_QUOTA); case CMD_OBJ_CT_HELPER: - return netlink_delete_obj(ctx, cmd, NFT_OBJECT_CT_HELPER); + return mnl_nft_obj_del(ctx, cmd, NFT_OBJECT_CT_HELPER); case CMD_OBJ_CT_TIMEOUT: - return netlink_delete_obj(ctx, cmd, - NFT_OBJECT_CT_TIMEOUT); + return mnl_nft_obj_del(ctx, cmd, NFT_OBJECT_CT_TIMEOUT); case CMD_OBJ_LIMIT: - return netlink_delete_obj(ctx, cmd, NFT_OBJECT_LIMIT); + return mnl_nft_obj_del(ctx, cmd, NFT_OBJECT_LIMIT); case CMD_OBJ_SECMARK: - return netlink_delete_obj(ctx, cmd, NFT_OBJECT_SECMARK); + return mnl_nft_obj_del(ctx, cmd, NFT_OBJECT_SECMARK); case CMD_OBJ_FLOWTABLE: return netlink_delete_flowtable(ctx, cmd); default: -- cgit v1.2.3