* [PATCH nft 1/2] src: fix nft_ctx_clear_include_paths in libnftables.map
@ 2021-07-24 10:28 Pablo Neira Ayuso
2021-07-24 10:28 ` [PATCH nft 2/2] src: expose nft_ctx_clear_vars as API Pablo Neira Ayuso
0 siblings, 1 reply; 2+ messages in thread
From: Pablo Neira Ayuso @ 2021-07-24 10:28 UTC (permalink / raw)
To: netfilter-devel
There a typo that prevents exposing the function as API.
Fixes: 16543a0136c0 ("libnftables: export public symbols only")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
src/libnftables.map | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libnftables.map b/src/libnftables.map
index c0185349ede4..46d64a38e6e0 100644
--- a/src/libnftables.map
+++ b/src/libnftables.map
@@ -1,7 +1,7 @@
LIBNFTABLES_1 {
global:
nft_ctx_add_include_path;
- nft_ctx_clear_include_pat;
+ nft_ctx_clear_include_paths;
nft_ctx_new;
nft_ctx_buffer_output;
nft_ctx_unbuffer_output;
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH nft 2/2] src: expose nft_ctx_clear_vars as API
2021-07-24 10:28 [PATCH nft 1/2] src: fix nft_ctx_clear_include_paths in libnftables.map Pablo Neira Ayuso
@ 2021-07-24 10:28 ` Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2021-07-24 10:28 UTC (permalink / raw)
To: netfilter-devel
This function might be useful to recycle the existing nft_ctx to use it
with different external variables definition.
Moreover, reset ctx->num_vars to zero.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
include/nftables/libnftables.h | 1 +
src/libnftables.c | 4 +++-
src/libnftables.map | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/include/nftables/libnftables.h b/include/nftables/libnftables.h
index aaf7388e6db2..8e7151a324b0 100644
--- a/include/nftables/libnftables.h
+++ b/include/nftables/libnftables.h
@@ -79,6 +79,7 @@ int nft_ctx_add_include_path(struct nft_ctx *ctx, const char *path);
void nft_ctx_clear_include_paths(struct nft_ctx *ctx);
int nft_ctx_add_var(struct nft_ctx *ctx, const char *var);
+void nft_ctx_clear_vars(struct nft_ctx *ctx);
int nft_run_cmd_from_buffer(struct nft_ctx *nft, const char *buf);
int nft_run_cmd_from_filename(struct nft_ctx *nft, const char *filename);
diff --git a/src/libnftables.c b/src/libnftables.c
index de6dc7cdae6c..aa6493aae119 100644
--- a/src/libnftables.c
+++ b/src/libnftables.c
@@ -145,7 +145,8 @@ int nft_ctx_add_var(struct nft_ctx *ctx, const char *var)
return 0;
}
-static void nft_ctx_clear_vars(struct nft_ctx *ctx)
+EXPORT_SYMBOL(nft_ctx_clear_vars);
+void nft_ctx_clear_vars(struct nft_ctx *ctx)
{
unsigned int i;
@@ -153,6 +154,7 @@ static void nft_ctx_clear_vars(struct nft_ctx *ctx)
xfree(ctx->vars[i].key);
xfree(ctx->vars[i].value);
}
+ ctx->num_vars = 0;
xfree(ctx->vars);
}
diff --git a/src/libnftables.map b/src/libnftables.map
index 46d64a38e6e0..d3a795ce8567 100644
--- a/src/libnftables.map
+++ b/src/libnftables.map
@@ -26,4 +26,5 @@ local: *;
LIBNFTABLES_2 {
nft_ctx_add_var;
+ nft_ctx_clear_vars;
} LIBNFTABLES_1;
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-24 10:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-24 10:28 [PATCH nft 1/2] src: fix nft_ctx_clear_include_paths in libnftables.map Pablo Neira Ayuso
2021-07-24 10:28 ` [PATCH nft 2/2] src: expose nft_ctx_clear_vars as API Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).