On Thu, Oct 19, 2017 at 10:18:46AM +0200, Phil Sutter wrote:
> In order to keep the API simple, remove INCLUDE_PATHS_MAX restraint and
> dynamically allocate nft_ctx field include_paths instead.
>
> Signed-off-by: Phil Sutter <phil@xxxxxx>
> ---
> include/nftables/nftables.h | 6 +++---
> src/libnftables.c | 34 ++++++++++++++++++++++++++++++++--
> src/main.c | 9 ++++-----
> src/scanner.l | 4 +---
> 4 files changed, 40 insertions(+), 13 deletions(-)
>
> diff --git a/include/nftables/nftables.h b/include/nftables/nftables.h
> index f0c9bbf3ba3fe..a752f20d74132 100644
> --- a/include/nftables/nftables.h
> +++ b/include/nftables/nftables.h
> @@ -17,8 +17,6 @@ struct nft_cache {
> uint32_t seqnum;
> };
>
> -#define INCLUDE_PATHS_MAX 16
> -
> struct output_ctx {
> unsigned int numeric;
> unsigned int stateless;
> @@ -30,7 +28,7 @@ struct output_ctx {
>
> struct nft_ctx {
> struct mnl_socket *nf_sock;
> - const char *include_paths[INCLUDE_PATHS_MAX];
> + char **include_paths;
> unsigned int num_include_paths;
> unsigned int parser_max_errors;
> unsigned int debug_mask;
> @@ -78,6 +76,8 @@ void nft_ctx_free(struct nft_ctx *ctx);
>
> FILE *nft_ctx_set_output(struct nft_ctx *ctx, FILE *fp);
> void nft_ctx_set_dry_run(struct nft_ctx *ctx, bool dry);
> +int nft_ctx_add_include_path(struct nft_ctx *ctx, const char *path);
> +void nft_ctx_clear_include_paths(struct nft_ctx *ctx);
>
> void nft_ctx_flush_cache(struct nft_ctx *ctx);
>
> diff --git a/src/libnftables.c b/src/libnftables.c
> index 817f537e32618..2f4275c9a0a94 100644
> --- a/src/libnftables.c
> +++ b/src/libnftables.c
> @@ -6,10 +6,13 @@
> * published by the Free Software Foundation.
> *
> */
> +#define _GNU_SOURCE
> #include <erec.h>
> #include <errno.h>
> #include <mnl.h>
> #include <parser.h>
> +#include <stdio.h>
> +#include <stdlib.h>
> #include <string.h>
> #include <utils.h>
> #include <iface.h>
> @@ -122,6 +125,33 @@ static void nft_exit(void)
> mark_table_exit();
> }
>
> +int nft_ctx_add_include_path(struct nft_ctx *ctx, const char *path)
Do we want to accept runtime addition/removal of include paths?
I mean, I would just make it nft_ctx_set_include_path(), then add an
unsetter, so we simplify this.
Let me know if I'm overlooking anything, thanks.
--
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
