From: Eric Leblond <eric@regit.org>
To: pablo@netfilter.org
Cc: netfilter-devel@vger.kernel.org, Eric Leblond <eric@regit.org>
Subject: [nft PATH 13/16] libnftables: set max_errors to 1 in library
Date: Wed, 16 Aug 2017 22:43:07 +0200 [thread overview]
Message-ID: <20170816204310.3371-14-eric@regit.org> (raw)
In-Reply-To: <20170816204310.3371-1-eric@regit.org>
As memory handling is defficient if we don't do so, we can't really
use a non 1 value for the parameter in the library due to memory
leak.
Also this is not a real issue as programmatically a user of the
library should only encounter one error at a time.
This patch also introduces a function that can be used to modify
the max_errors parameter. It is used in main to keep the existing
behavior.
Signed-off-by: Eric Leblond <eric@regit.org>
---
include/nftables/nftables.h | 1 +
src/libnftables.c | 8 +++++++-
src/main.c | 1 +
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/include/nftables/nftables.h b/include/nftables/nftables.h
index 2ddb38a..f419884 100644
--- a/include/nftables/nftables.h
+++ b/include/nftables/nftables.h
@@ -22,6 +22,7 @@ enum nftables_exit_codes {
};
void nft_global_init(void);
+int nft_global_set_max_errors(unsigned int errors);
void nft_global_deinit(void);
struct nft_ctx *nft_context_new(void);
diff --git a/src/libnftables.c b/src/libnftables.c
index 08050e5..c50c068 100644
--- a/src/libnftables.c
+++ b/src/libnftables.c
@@ -25,7 +25,7 @@
#include <fcntl.h>
-unsigned int max_errors = 10;
+unsigned int max_errors = 1;
unsigned int numeric_output;
unsigned int ip2name_output;
unsigned int handle_output;
@@ -58,6 +58,12 @@ void nft_global_deinit(void)
mark_table_exit();
}
+int nft_global_set_max_errors(unsigned int errors)
+{
+ max_errors = errors;
+ return 0;
+}
+
__attribute__((format(printf, 2, 0)))
static int nft_print(void *ctx, const char *fmt, ...)
{
diff --git a/src/main.c b/src/main.c
index a6305cc..bb08c31 100644
--- a/src/main.c
+++ b/src/main.c
@@ -192,6 +192,7 @@ int main(int argc, char * const *argv)
struct nft_ctx *nft;
nft_global_init();
+ nft_global_set_max_errors(10);
nft = nft_context_new();
while (1) {
val = getopt_long(argc, argv, OPTSTRING, options, NULL);
--
2.14.1
next prev parent reply other threads:[~2017-08-16 21:25 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-16 20:42 [nft PATCH 0/16] introduce libnftables Eric Leblond
2017-08-16 20:42 ` [nft PATH 01/16] libnftables: introduce library Eric Leblond
2017-08-17 8:57 ` Phil Sutter
2017-08-17 17:09 ` Eric Leblond
2017-08-17 17:13 ` Phil Sutter
2017-08-19 8:43 ` Eric Leblond
2017-08-19 19:07 ` Jan Engelhardt
2017-08-21 8:19 ` Pablo Neira Ayuso
2017-08-16 20:42 ` [nft PATH 02/16] libnftables: add context new and free Eric Leblond
2017-08-17 9:04 ` Phil Sutter
2017-08-16 20:42 ` [nft PATH 03/16] libnftables: add nft_run_command_from_buffer Eric Leblond
2017-08-17 9:21 ` Phil Sutter
2017-08-16 20:42 ` [nft PATH 04/16] libnftables: add nft_run_command_from_filename Eric Leblond
2017-08-16 20:42 ` [nft PATH 05/16] libnftables: put nft_run in library Eric Leblond
2017-08-16 20:43 ` [nft PATH 06/16] libnftables: add missing variable to library Eric Leblond
2017-08-17 9:35 ` Phil Sutter
2017-08-19 11:02 ` Eric Leblond
2017-08-16 20:43 ` [nft PATH 07/16] libnftables: add NFT_EXIT_* " Eric Leblond
2017-08-16 20:43 ` [nft PATH 08/16] libnftables: add a nft_cache to nft_ctx Eric Leblond
2017-08-17 9:43 ` Phil Sutter
2017-08-16 20:43 ` [nft PATH 09/16] libnftables: move iface_cache_release to deinit Eric Leblond
2017-08-16 20:43 ` [nft PATH 10/16] libnftables: get rid of printf Eric Leblond
2017-08-17 10:01 ` Phil Sutter
2017-08-19 8:59 ` Eric Leblond
2017-08-16 20:43 ` [nft PATH 11/16] libnftables: add nft_context_set_print Eric Leblond
2017-08-16 20:43 ` [nft PATH 12/16] libnftables: transaction support Eric Leblond
2017-08-17 10:11 ` Phil Sutter
2017-08-16 20:43 ` Eric Leblond [this message]
2017-08-16 20:43 ` [nft PATH 14/16] erec: add function to free list Eric Leblond
2017-08-16 20:43 ` [nft PATH 15/16] libnftables: add error handling Eric Leblond
2017-08-17 10:32 ` Phil Sutter
2017-08-19 9:04 ` Eric Leblond
2017-08-16 20:43 ` [nft PATH 16/16] libnftables: basic doxygen documentation Eric Leblond
2017-08-17 8:32 ` [nft PATCH 0/16] introduce libnftables Arturo Borrero Gonzalez
2017-08-17 8:58 ` Eric Leblond
2017-08-17 10:35 ` Florian Westphal
2017-08-17 10:47 ` Phil Sutter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170816204310.3371-14-eric@regit.org \
--to=eric@regit.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).