include: add cli.h

Needed by follow up patches to use autotools.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/cli.h b/include/cli.h
new file mode 100644 (file)
index 0000000..89cb976
--- /dev/null
+++ b/include/cli.h
@@ -0,0 +1,18 @@
+#ifndef _NFT_CLI_H_
+#define _NFT_CLI_H_
+
+#include <config.h>
+
+struct parser_state;
+#ifdef HAVE_LIBREADLINE
+extern int cli_init(struct parser_state *state);
+#else
+static inline int cli_init(struct parser_state *state)
+{
+        return -1;
+}
+#endif
+extern void cli_exit(void);
+extern void cli_display(const char *fmt, va_list ap) __fmtstring(1, 0);
+
+#endif

diff --git a/include/nftables.h b/include/nftables.h
index 4c33ec63264403620826b4e48bd90f186fdb01ef..cf19de82cbb038953b9d6d17fd816b4056fc2710 100644 (file)
--- a/include/nftables.h
+++ b/include/nftables.h
@@ -31,18 +31,6 @@ extern unsigned int handle_output;
 extern unsigned int debug_level;
 extern const char *include_paths[INCLUDE_PATHS_MAX];
 
-struct parser_state;
-#ifdef HAVE_LIBREADLINE
-extern int cli_init(struct parser_state *state);
-#else
-static inline int cli_init(struct parser_state *state)
-{
-       return -1;
-}
-#endif
-extern void cli_exit(void);
-extern void cli_display(const char *fmt, va_list ap) __fmtstring(1, 0);
-
 enum nftables_exit_codes {
        NFT_EXIT_SUCCESS        = 0,
        NFT_EXIT_FAILURE        = 1,
@@ -116,6 +104,8 @@ struct input_descriptor {
        off_t                           line_offset;
 };
 
+struct parser_state;
+
 int nft_run(void *scanner, struct parser_state *state, struct list_head *msgs);
 
 #endif /* NFTABLES_NFTABLES_H */

diff --git a/src/cli.c b/src/cli.c
index f748a0e2cbf38c02937e4255fd849d91fd6a9c3e..6f2847b8e8d82cb56d0fd7d7422f09a65dacc7c5 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -27,6 +27,7 @@
 #include <parser.h>
 #include <erec.h>
 #include <utils.h>
+#include <cli.h>
 
 #define CMDLINE_HISTFILE       ".nft.history"
 

diff --git a/src/main.c b/src/main.c
index 16259143116cd5922141fdd46dc47068acb2eaa3..b447aad0ff76c27f9f5dfe1b30f4ff2d140845cb 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -25,6 +25,7 @@
 #include <netlink.h>
 #include <erec.h>
 #include <mnl.h>
+#include <cli.h>
 
 unsigned int max_errors = 10;
 unsigned int numeric_output;