summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2018-12-27 21:19:08 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2018-12-27 21:21:52 +0100
commitc351f337b4e5c71b3551eef1d1b936d1e56b5601 (patch)
tree8801066320447f2547bf44331778b7a40a876efe /include
parent8d51f169e0e832a41d2ed278be903c08bd4fa473 (diff)
src: remove deprecated code for export/import commands
Update parser to display this error message: # nft export json Error: JSON export is no longer supported, use 'nft -j list ruleset' instead export json ^^^^^^^^^^^^ Just like: # nft export vm json Error: JSON export is no longer supported, use 'nft -j list ruleset' instead export vm json ^^^^^^^^^^^^^^^ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include')
-rw-r--r--include/mnl.h2
-rw-r--r--include/netlink.h5
2 files changed, 0 insertions, 7 deletions
diff --git a/include/mnl.h b/include/mnl.h
index 1784b3aa..c63a7e7f 100644
--- a/include/mnl.h
+++ b/include/mnl.h
@@ -81,8 +81,6 @@ int mnl_nft_flowtable_add(struct netlink_ctx *ctx, const struct cmd *cmd,
unsigned int flags);
int mnl_nft_flowtable_del(struct netlink_ctx *ctx, const struct cmd *cmd);
-struct nftnl_ruleset *mnl_nft_ruleset_dump(struct netlink_ctx *ctx,
- uint32_t family);
int mnl_nft_event_listener(struct mnl_socket *nf_sock, unsigned int debug_mask,
struct output_ctx *octx,
int (*cb)(const struct nlmsghdr *nlh, void *data),
diff --git a/include/netlink.h b/include/netlink.h
index a8528d59..a20ebbe4 100644
--- a/include/netlink.h
+++ b/include/netlink.h
@@ -163,9 +163,6 @@ extern int netlink_io_error(struct netlink_ctx *ctx,
__netlink_init_error(__FILE__, __LINE__, strerror(errno));
extern void __noreturn __netlink_init_error(const char *file, int line, const char *reason);
-extern struct nftnl_ruleset *netlink_dump_ruleset(struct netlink_ctx *ctx,
- const struct handle *h,
- const struct location *loc);
struct netlink_mon_handler {
uint32_t monitor_flags;
uint32_t format;
@@ -187,8 +184,6 @@ struct ruleset_parse {
struct nftnl_parse_ctx;
-int netlink_markup_parse_cb(const struct nftnl_parse_ctx *ctx);
-
int netlink_events_trace_cb(const struct nlmsghdr *nlh, int type,
struct netlink_mon_handler *monh);