It had a nft_get_error to be able to fetch existing errors and get
them into a buffer that can be later used by the application.
Signed-off-by: Eric Leblond <eric@xxxxxxxxx>
---
include/nftables.h | 1 +
include/nftables/nftables.h | 1 +
src/libnftables.c | 29 ++++++++++++++++++-----------
3 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/include/nftables.h b/include/nftables.h
index ddff5d8..9d119b1 100644
--- a/include/nftables.h
+++ b/include/nftables.h
@@ -30,6 +30,7 @@ struct output_ctx {
unsigned int ip2name;
unsigned int handle;
unsigned int echo;
+ struct list_head msgs;
void *ctx;
int (*print)(void *ctx, const char *format, ...);
};
diff --git a/include/nftables/nftables.h b/include/nftables/nftables.h
index f419884..c72ec6b 100644
--- a/include/nftables/nftables.h
+++ b/include/nftables/nftables.h
@@ -30,6 +30,7 @@ void nft_context_free(struct nft_ctx *nft);
void nft_context_set_print_func(struct nft_ctx *nft,
int (*print)(void *ctx, const char *fmt, ...),
void *ctx);
+int nft_get_error(struct nft_ctx *nft, char *err_buf, size_t err_buf_len);
int nft_run_command_from_buffer(struct nft_ctx *nft,
char *buf, size_t buflen);
diff --git a/src/libnftables.c b/src/libnftables.c
index c50c068..a42e8f1 100644
--- a/src/libnftables.c
+++ b/src/libnftables.c
@@ -86,6 +86,7 @@ struct nft_ctx *nft_context_new(void)
ctx->nf_sock = netlink_open_sock();
init_list_head(&ctx->cache.list);
+ init_list_head(&ctx->output.msgs);
ctx->output.ctx = ctx;
ctx->output.print = nft_print;
@@ -108,6 +109,7 @@ void nft_context_free(struct nft_ctx *nft)
return;
netlink_close_sock(nft->nf_sock);
cache_release(&nft->cache);
+ erec_free_list(&nft->output.msgs);
xfree(nft);
}
@@ -116,23 +118,30 @@ static const struct input_descriptor indesc_cmdline = {
.name = "<cmdline>",
};
+int nft_get_error(struct nft_ctx *nft, char *err_buf, size_t err_buf_len)
+{
+ FILE *errfile = fmemopen(err_buf, err_buf_len, "w");
+ erec_print_list(errfile, &nft->output.msgs);
+ fclose(errfile);
+ return 0;
+}
+
int nft_run_command_from_buffer(struct nft_ctx *nft,
char *buf, size_t buflen)
{
int rc = NFT_EXIT_SUCCESS;
struct parser_state state;
- LIST_HEAD(msgs);
void *scanner;
- parser_init(nft->nf_sock, &nft->cache, &state, &msgs);
+ parser_init(nft->nf_sock, &nft->cache, &state, &nft->output.msgs);
scanner = scanner_init(&state);
scanner_push_buffer(scanner, &indesc_cmdline, buf);
- if (nft_run(nft, nft->nf_sock, &nft->cache, scanner, &state, &msgs) != 0)
+ if (nft_run(nft, nft->nf_sock, &nft->cache, scanner,
+ &state, &nft->output.msgs) != 0)
rc = NFT_EXIT_FAILURE;
scanner_destroy(scanner);
- erec_print_list(stderr, &msgs);
return rc;
}
@@ -146,15 +155,15 @@ int nft_run_command_from_filename(struct nft_ctx *nft, const char *filename)
rc = cache_update(nft->nf_sock, &nft->cache, CMD_INVALID, &msgs);
if (rc < 0)
return rc;
- parser_init(nft->nf_sock, &nft->cache, &state, &msgs);
+ parser_init(nft->nf_sock, &nft->cache, &state, &nft->output.msgs);
scanner = scanner_init(&state);
if (scanner_read_file(scanner, filename, &internal_location) < 0)
return NFT_EXIT_FAILURE;
- if (nft_run(nft, nft->nf_sock, &nft->cache, scanner, &state, &msgs) != 0)
+ if (nft_run(nft, nft->nf_sock, &nft->cache, scanner,
+ &state, &nft->output.msgs) != 0)
rc = NFT_EXIT_FAILURE;
scanner_destroy(scanner);
- erec_print_list(stderr, &msgs);
return rc;
}
@@ -176,14 +185,13 @@ int nft_batch_add(struct nft_ctx *nft, struct nft_batch *batch,
int rc = NFT_EXIT_SUCCESS;
int ret = 0;
struct parser_state state;
- LIST_HEAD(msgs);
void *scanner;
struct cmd *cmd, *next;
struct netlink_ctx *ctx = &batch->nl_ctx;
uint32_t seqnum;
bool batch_supported = netlink_batch_supported(nft->nf_sock, &seqnum);
- parser_init(nft->nf_sock, &nft->cache, &state, &msgs);
+ parser_init(nft->nf_sock, &nft->cache, &state, &nft->output.msgs);
scanner = scanner_init(&state);
scanner_push_buffer(scanner, &indesc_cmdline, buf);
@@ -196,7 +204,7 @@ int nft_batch_add(struct nft_ctx *nft, struct nft_batch *batch,
list_for_each_entry(cmd, &state.cmds, list) {
nft_cmd_expand(cmd);
memset(ctx, 0, sizeof(*ctx));
- ctx->msgs = &msgs;
+ ctx->msgs = &nft->output.msgs;
ctx->seqnum = cmd->seqnum = mnl_seqnum_alloc(&seqnum);
ctx->batch = batch->batch;
ctx->batch_supported = batch_supported;
@@ -215,7 +223,6 @@ int nft_batch_add(struct nft_ctx *nft, struct nft_batch *batch,
}
err1:
scanner_destroy(scanner);
- erec_print_list(stderr, &msgs);
return rc;
}
--
2.14.1
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
