{"id":809368,"url":"http://patchwork.ozlabs.org/api/1.0/patches/809368/?format=json","project":{"id":26,"url":"http://patchwork.ozlabs.org/api/1.0/projects/26/?format=json","name":"Netfilter Development","link_name":"netfilter-devel","list_id":"netfilter-devel.vger.kernel.org","list_email":"netfilter-devel@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<20170903220356.20178-2-eric@regit.org>","date":"2017-09-03T22:03:55","name":"[nft,1/2] src: add flags fo nft_ctx_new","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"a4c5d95457e8ddbcd977079b77be8dc209645783","submitter":{"id":8198,"url":"http://patchwork.ozlabs.org/api/1.0/people/8198/?format=json","name":"Eric Leblond","email":"eric@regit.org"},"delegate":{"id":6139,"url":"http://patchwork.ozlabs.org/api/1.0/users/6139/?format=json","username":"pablo","first_name":"Pablo","last_name":"Neira","email":"pablo@netfilter.org"},"mbox":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20170903220356.20178-2-eric@regit.org/mbox/","series":[{"id":1279,"url":"http://patchwork.ozlabs.org/api/1.0/series/1279/?format=json","date":"2017-09-03T22:03:54","name":"libnftables preparation work","version":1,"mbox":"http://patchwork.ozlabs.org/series/1279/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809368/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netfilter-devel-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xln7Y2YFtz9sPs\n\tfor ;\n\tMon, 4 Sep 2017 08:04:09 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1753010AbdICWEI (ORCPT );\n\tSun, 3 Sep 2017 18:04:08 -0400","from home.regit.org ([37.187.126.138]:38256 \"EHLO home.regit.org\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1752983AbdICWEH (ORCPT );\n\tSun, 3 Sep 2017 18:04:07 -0400","from [2a01:e35:2fb6:1160:f022:11:465e:d69b]\n\t(helo=ice-age2.regit.org) by home.regit.org with esmtpsa\n\t(TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89)\n\t(envelope-from )\n\tid 1doczt-0002FD-O2; Mon, 04 Sep 2017 00:04:06 +0200"],"From":"Eric Leblond ","To":"pablo@netfilter.org","Cc":"netfilter-devel@vger.kernel.org, Eric Leblond ","Subject":"[nft PATCH 1/2] src: add flags fo nft_ctx_new","Date":"Mon, 4 Sep 2017 00:03:55 +0200","Message-Id":"<20170903220356.20178-2-eric@regit.org>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<20170903220356.20178-1-eric@regit.org>","References":"<20170903220356.20178-1-eric@regit.org>","X-Spam-Score":"-1.0 (-)","Sender":"netfilter-devel-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netfilter-devel@vger.kernel.org"},"content":"By adding flags to nft_ctx_new, we will have a minimum capabilities\nof changing the way the nft_ctx is created.\n\nFor now, this patch uses a simple value that allow the user to specify\nthat he will handle netlink by himself.\n\nSigned-off-by: Eric Leblond \n---\n include/nftables.h | 4 ++++\n src/main.c | 20 +++++++++++---------\n 2 files changed, 15 insertions(+), 9 deletions(-)","diff":"diff --git a/include/nftables.h b/include/nftables.h\nindex 5035567..7c4e93f 100644\n--- a/include/nftables.h\n+++ b/include/nftables.h\n@@ -49,8 +49,12 @@ struct nft_ctx {\n \tstruct output_ctx\toutput;\n \tbool\t\t\tcheck;\n \tstruct nft_cache\tcache;\n+\tuint32_t\t\tflags;\n };\n \n+#define NFT_CTX_CUSTOM_NETLINK\t(1<<0)\n+#define NFT_CTX_DEFAULT\t\t0\n+\n enum nftables_exit_codes {\n \tNFT_EXIT_SUCCESS\t= 0,\n \tNFT_EXIT_FAILURE\t= 1,\ndiff --git a/src/main.c b/src/main.c\nindex fce9bfe..94f8a47 100644\n--- a/src/main.c\n+++ b/src/main.c\n@@ -281,7 +281,12 @@ static void nft_exit(void)\n \tmark_table_exit();\n }\n \n-static struct nft_ctx *nft_ctx_new(void)\n+static void nft_ctx_netlink_init(struct nft_ctx *ctx)\n+{\n+\tctx->nf_sock = netlink_open_sock();\n+}\n+\n+static struct nft_ctx *nft_ctx_new(uint32_t flags)\n {\n \tstruct nft_ctx *ctx;\n \n@@ -292,6 +297,10 @@ static struct nft_ctx *nft_ctx_new(void)\n \tctx->num_include_paths\t= 1;\n \tctx->parser_max_errors\t= 10;\n \tinit_list_head(&ctx->cache.list);\n+\tctx->flags = flags;\n+\n+\tif (! (flags & NFT_CTX_CUSTOM_NETLINK))\n+\t\tnft_ctx_netlink_init(ctx);\n \n \treturn ctx;\n }\n@@ -307,11 +316,6 @@ static void nft_ctx_free(const struct nft_ctx *ctx)\n \tnft_exit();\n }\n \n-static void nft_ctx_netlink_init(struct nft_ctx *ctx)\n-{\n-\tctx->nf_sock = netlink_open_sock();\n-}\n-\n static int nft_run_cmd_from_buffer(struct nft_ctx *nft,\n \t\t\t\t char *buf, size_t buflen)\n {\n@@ -367,9 +371,7 @@ int main(int argc, char * const *argv)\n \tstruct parser_state state;\n \tint i, val, rc;\n \n-\tnft = nft_ctx_new();\n-\n-\tnft_ctx_netlink_init(nft);\n+\tnft = nft_ctx_new(NFT_CTX_DEFAULT);\n \n \twhile (1) {\n \t\tval = getopt_long(argc, argv, OPTSTRING, options, NULL);\n","prefixes":["nft","1/2"]}