Re: [nft PATCH v2 1/2] src: add flags fo nft_ctx_new

[Pablo Neira Ayuso]

On Mon, Sep 04, 2017 at 09:55:57AM +0200, Eric Leblond wrote:
> By adding flags to nft_ctx_new, we will have a minimum capabilities
> of changing the way the nft_ctx is created.
> 
> For now, this patch uses a simple value that allow the user to specify
> that he will handle netlink by himself.

Applied, thanks Eric.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[nft PATCH v2 1/2] src: add flags fo nft_ctx_new

[Eric Leblond]

By adding flags to nft_ctx_new, we will have a minimum capabilities
of changing the way the nft_ctx is created.

For now, this patch uses a simple value that allow the user to specify
that he will handle netlink by himself.

Signed-off-by: Eric Leblond 
---
 include/nftables.h |  3 +++
 src/main.c | 20 +++-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/include/nftables.h b/include/nftables.h
index 5035567..3429e4c 100644
--- a/include/nftables.h
+++ b/include/nftables.h
@@ -49,8 +49,11 @@ struct nft_ctx {
struct output_ctx   output;
boolcheck;
struct nft_cachecache;
+   uint32_tflags;
 };
 
+#define NFT_CTX_DEFAULT0
+
 enum nftables_exit_codes {
NFT_EXIT_SUCCESS= 0,
NFT_EXIT_FAILURE= 1,
diff --git a/src/main.c b/src/main.c
index fce9bfe..702ef30 100644
--- a/src/main.c
+++ b/src/main.c
@@ -281,7 +281,12 @@ static void nft_exit(void)
mark_table_exit();
 }
 
-static struct nft_ctx *nft_ctx_new(void)
+static void nft_ctx_netlink_init(struct nft_ctx *ctx)
+{
+   ctx->nf_sock = netlink_open_sock();
+}
+
+static struct nft_ctx *nft_ctx_new(uint32_t flags)
 {
struct nft_ctx *ctx;
 
@@ -292,6 +297,10 @@ static struct nft_ctx *nft_ctx_new(void)
ctx->num_include_paths  = 1;
ctx->parser_max_errors  = 10;
init_list_head(>cache.list);
+   ctx->flags = flags;
+
+   if (flags == NFT_CTX_DEFAULT)
+   nft_ctx_netlink_init(ctx);
 
return ctx;
 }
@@ -307,11 +316,6 @@ static void nft_ctx_free(const struct nft_ctx *ctx)
nft_exit();
 }
 
-static void nft_ctx_netlink_init(struct nft_ctx *ctx)
-{
-   ctx->nf_sock = netlink_open_sock();
-}
-
 static int nft_run_cmd_from_buffer(struct nft_ctx *nft,
   char *buf, size_t buflen)
 {
@@ -367,9 +371,7 @@ int main(int argc, char * const *argv)
struct parser_state state;
int i, val, rc;
 
-   nft = nft_ctx_new();
-
-   nft_ctx_netlink_init(nft);
+   nft = nft_ctx_new(NFT_CTX_DEFAULT);
 
while (1) {
val = getopt_long(argc, argv, OPTSTRING, options, NULL);
-- 
2.14.1

--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html