From: Eric Leblond <eric@regit.org>
To: pablo@netfilter.org
Cc: netfilter-devel@vger.kernel.org, Eric Leblond <eric@regit.org>
Subject: [PATH nft v2 09/18] libnftables: add NFT_EXIT_* to library
Date: Sat, 19 Aug 2017 17:24:11 +0200 [thread overview]
Message-ID: <20170819152420.22563-10-eric@regit.org> (raw)
In-Reply-To: <20170819152420.22563-1-eric@regit.org>
So it can be used by client to check function return.
Signed-off-by: Eric Leblond <eric@regit.org>
---
include/nftables.h | 7 -------
include/nftables/nftables.h | 7 +++++++
src/netlink.c | 1 +
src/utils.c | 1 +
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/include/nftables.h b/include/nftables.h
index c2bb7d8..aad204e 100644
--- a/include/nftables.h
+++ b/include/nftables.h
@@ -48,13 +48,6 @@ extern unsigned int max_errors;
extern unsigned int debug_level;
extern const char *include_paths[INCLUDE_PATHS_MAX];
-enum nftables_exit_codes {
- NFT_EXIT_SUCCESS = 0,
- NFT_EXIT_FAILURE = 1,
- NFT_EXIT_NOMEM = 2,
- NFT_EXIT_NONL = 3,
-};
-
struct input_descriptor;
struct location {
const struct input_descriptor *indesc;
diff --git a/include/nftables/nftables.h b/include/nftables/nftables.h
index 980c6ec..20a062c 100644
--- a/include/nftables/nftables.h
+++ b/include/nftables/nftables.h
@@ -14,6 +14,13 @@
#include <stdint.h>
#include <stdbool.h>
+enum nftables_exit_codes {
+ NFT_EXIT_SUCCESS = 0,
+ NFT_EXIT_FAILURE = 1,
+ NFT_EXIT_NOMEM = 2,
+ NFT_EXIT_NONL = 3,
+};
+
void nft_global_init(void);
void nft_global_deinit(void);
diff --git a/src/netlink.c b/src/netlink.c
index 7311149..ea5d9b1 100644
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -30,6 +30,7 @@
#include <linux/netfilter.h>
#include <nftables.h>
+#include <nftables/nftables.h>
#include <netlink.h>
#include <mnl.h>
#include <expression.h>
diff --git a/src/utils.c b/src/utils.c
index 47f5b79..aace563 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -16,6 +16,7 @@
#include <string.h>
#include <nftables.h>
+#include <nftables/nftables.h>
#include <utils.h>
void __noreturn __memory_allocation_error(const char *filename, uint32_t line)
--
2.14.1
next prev parent reply other threads:[~2017-08-19 15:24 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-19 15:24 [PATCH nft v2 00/18] introducing libnftables Eric Leblond
2017-08-19 15:24 ` [PATH nft v2 01/18] mnl: fix error handling in mnl_batch_talk Eric Leblond
2017-08-21 8:10 ` Pablo Neira Ayuso
2017-08-21 19:01 ` Eric Leblond
2017-08-24 15:13 ` Pablo Neira Ayuso
2017-08-19 15:24 ` [PATH nft v2 02/18] erec: add function to free list Eric Leblond
2017-08-21 8:12 ` Pablo Neira Ayuso
2017-08-19 15:24 ` [PATH nft v2 03/18] libnftables: introduce library Eric Leblond
2017-08-19 15:24 ` [PATH nft v2 04/18] libnftables: add context new and free Eric Leblond
2017-08-21 8:17 ` Pablo Neira Ayuso
2017-08-24 15:30 ` Pablo Neira Ayuso
2017-08-25 11:22 ` Eric Leblond
2017-08-19 15:24 ` [PATH nft v2 05/18] libnftables: add nft_run_command_from_buffer Eric Leblond
2017-08-21 8:23 ` Pablo Neira Ayuso
2017-08-21 8:45 ` Pablo Neira Ayuso
2017-08-21 9:06 ` Eric Leblond
2017-08-21 9:44 ` Pablo Neira Ayuso
2017-08-21 19:21 ` Eric Leblond
2017-08-22 12:37 ` Pablo Neira Ayuso
2017-08-25 11:16 ` Eric Leblond
2017-08-24 15:49 ` Pablo Neira Ayuso
2017-08-25 11:26 ` Eric Leblond
2017-08-19 15:24 ` [PATH nft v2 06/18] libnftables: add nft_run_command_from_filename Eric Leblond
2017-08-19 15:24 ` [PATH nft v2 07/18] libnftables: put nft_run in library Eric Leblond
2017-08-19 15:24 ` [PATH nft v2 08/18] libnftables: add missing variables to library Eric Leblond
2017-08-21 8:27 ` Pablo Neira Ayuso
2017-08-21 19:04 ` Eric Leblond
2017-08-19 15:24 ` Eric Leblond [this message]
2017-08-19 15:24 ` [PATH nft v2 10/18] libnftables: add a nft_cache to nft_ctx Eric Leblond
2017-08-21 8:32 ` Pablo Neira Ayuso
2017-08-19 15:24 ` [PATH nft v2 11/18] libnftables: move iface_cache_release to deinit Eric Leblond
2017-08-21 8:33 ` Pablo Neira Ayuso
2017-08-24 15:55 ` Pablo Neira Ayuso
2017-08-19 15:24 ` [PATH nft v2 12/18] libnftables: get rid of printf Eric Leblond
2017-08-19 15:24 ` [PATH nft v2 13/18] libnftables: add nft_context_set_print Eric Leblond
2017-08-25 9:59 ` Pablo Neira Ayuso
2017-08-25 11:49 ` Eric Leblond
2017-08-30 10:46 ` Pablo Neira Ayuso
2017-08-31 10:09 ` Pablo Neira Ayuso
2017-08-19 15:24 ` [PATH nft v2 14/18] libnftables: transaction support Eric Leblond
2017-08-19 15:24 ` [PATH nft v2 15/18] libnftables: set max_errors to 1 in library Eric Leblond
2017-08-21 8:37 ` Pablo Neira Ayuso
2017-08-21 19:12 ` Eric Leblond
2017-08-22 15:04 ` Phil Sutter
2017-08-24 16:02 ` Pablo Neira Ayuso
2017-08-25 11:37 ` Eric Leblond
2017-08-28 15:18 ` Pablo Neira Ayuso
2017-08-19 15:24 ` [PATH nft v2 16/18] libnftables: add error handling Eric Leblond
2017-08-19 15:24 ` [PATH nft v2 17/18] libnftables: suppress unused global variables Eric Leblond
2017-08-21 8:40 ` Pablo Neira Ayuso
2017-08-19 15:24 ` [PATH nft v2 18/18] libnftables: doxygen documentation Eric Leblond
2017-08-21 8:55 ` [PATCH nft v2 00/18] introducing libnftables Pablo Neira Ayuso
2017-08-21 21:42 ` Eric Leblond
2017-08-22 17:30 ` Pablo Neira Ayuso
2017-08-30 10:31 ` Phil Sutter
2017-08-31 10:19 ` Pablo Neira Ayuso
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=20170819152420.22563-10-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).