From f8aec603aa7e9dad1316079d42c7efcc52b773fa Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Mon, 17 Feb 2020 22:38:13 +0100 Subject: src: initial extended netlink error reporting This patch correlates the in-kernel extended netlink error offset and the location information. Assuming 'foo' table does not exist, then error reporting shows: # nft delete table foo Error: Could not process rule: No such file or directory delete table foo ^^^ Similarly, if table uniquely identified by handle '1234' does not exist, then error reporting shows: # nft delete table handle 1234 Error: Could not process rule: No such file or directory delete table handle 1234 ^^^^ Assuming 'bar' chain does not exists in the kernel, while 'foo' does: # nft delete chain foo bar Error: Could not process rule: No such file or directory delete chain foo bar ^^^ This also gives us a hint when adding rules: # nft add rule ip foo bar counter Error: Could not process rule: No such file or directory add rule ip foo bar counter ^^^ This is based on ("src: basic support for extended netlink errors") from Florian Westphal, posted in 2018, with no netlink offset correlation support. Signed-off-by: Pablo Neira Ayuso --- include/mnl.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'include/mnl.h') diff --git a/include/mnl.h b/include/mnl.h index eeba7379..07669957 100644 --- a/include/mnl.h +++ b/include/mnl.h @@ -16,6 +16,7 @@ struct mnl_err { struct list_head head; int err; uint32_t seqnum; + uint32_t offset; }; void mnl_err_list_free(struct mnl_err *err); @@ -28,7 +29,7 @@ void mnl_batch_end(struct nftnl_batch *batch, uint32_t seqnum); int mnl_batch_talk(struct netlink_ctx *ctx, struct list_head *err_list, uint32_t num_cmds); -int mnl_nft_rule_add(struct netlink_ctx *ctx, const struct cmd *cmd, +int mnl_nft_rule_add(struct netlink_ctx *ctx, struct cmd *cmd, unsigned int flags); int mnl_nft_rule_del(struct netlink_ctx *ctx, const struct cmd *cmd); int mnl_nft_rule_replace(struct netlink_ctx *ctx, const struct cmd *cmd); @@ -38,7 +39,7 @@ struct nftnl_rule_list *mnl_nft_rule_dump(struct netlink_ctx *ctx, int mnl_nft_chain_add(struct netlink_ctx *ctx, const struct cmd *cmd, unsigned int flags); -int mnl_nft_chain_del(struct netlink_ctx *ctx, const struct cmd *cmd); +int mnl_nft_chain_del(struct netlink_ctx *ctx, struct cmd *cmd); int mnl_nft_chain_rename(struct netlink_ctx *ctx, const struct cmd *cmd, const struct chain *chain); @@ -47,14 +48,14 @@ struct nftnl_chain_list *mnl_nft_chain_dump(struct netlink_ctx *ctx, int mnl_nft_table_add(struct netlink_ctx *ctx, const struct cmd *cmd, unsigned int flags); -int mnl_nft_table_del(struct netlink_ctx *ctx, const struct cmd *cmd); +int mnl_nft_table_del(struct netlink_ctx *ctx, struct cmd *cmd); struct nftnl_table_list *mnl_nft_table_dump(struct netlink_ctx *ctx, int family); int mnl_nft_set_add(struct netlink_ctx *ctx, const struct cmd *cmd, unsigned int flags); -int mnl_nft_set_del(struct netlink_ctx *ctx, const struct cmd *cmd); +int mnl_nft_set_del(struct netlink_ctx *ctx, struct cmd *cmd); struct nftnl_set_list *mnl_nft_set_dump(struct netlink_ctx *ctx, int family, const char *table); @@ -73,14 +74,14 @@ struct nftnl_obj_list *mnl_nft_obj_dump(struct netlink_ctx *ctx, int family, bool dump, bool reset); int mnl_nft_obj_add(struct netlink_ctx *ctx, const struct cmd *cmd, unsigned int flags); -int mnl_nft_obj_del(struct netlink_ctx *ctx, const struct cmd *cmd, int type); +int mnl_nft_obj_del(struct netlink_ctx *ctx, struct cmd *cmd, int type); struct nftnl_flowtable_list * mnl_nft_flowtable_dump(struct netlink_ctx *ctx, int family, const char *table); int mnl_nft_flowtable_add(struct netlink_ctx *ctx, const struct cmd *cmd, unsigned int flags); -int mnl_nft_flowtable_del(struct netlink_ctx *ctx, const struct cmd *cmd); +int mnl_nft_flowtable_del(struct netlink_ctx *ctx, struct cmd *cmd); int mnl_nft_event_listener(struct mnl_socket *nf_sock, unsigned int debug_mask, struct output_ctx *octx, -- cgit v1.2.3