diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-12-27 21:19:08 +0100 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-12-27 21:21:52 +0100 |
commit | c351f337b4e5c71b3551eef1d1b936d1e56b5601 (patch) | |
tree | 8801066320447f2547bf44331778b7a40a876efe /src/rule.c | |
parent | 8d51f169e0e832a41d2ed278be903c08bd4fa473 (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 'src/rule.c')
-rw-r--r-- | src/rule.c | 45 |
1 files changed, 2 insertions, 43 deletions
@@ -1597,47 +1597,6 @@ static int do_command_delete(struct netlink_ctx *ctx, struct cmd *cmd) } } -static int do_command_export(struct netlink_ctx *ctx, struct cmd *cmd) -{ - struct nftnl_ruleset *rs; - FILE *fp = ctx->nft->output.output_fp; - - do { - rs = netlink_dump_ruleset(ctx, &cmd->handle, &cmd->location); - if (rs == NULL && errno != EINTR) - return -1; - } while (rs == NULL); - - nftnl_ruleset_fprintf(fp, rs, cmd->markup->format, NFTNL_OF_EVENT_NEW); - - nft_print(&ctx->nft->output, "\n"); - - nftnl_ruleset_free(rs); - return 0; -} - -static int do_command_import(struct netlink_ctx *ctx, struct cmd *cmd) -{ - int ret; - struct nftnl_parse_err *err; - struct ruleset_parse rp = { - .nl_ctx = ctx, - .cmd = cmd - }; - - err = nftnl_parse_err_alloc(); - if (err == NULL) - return -1; - - ret = nftnl_ruleset_parse_file_cb(cmd->markup->format, stdin, err, &rp, - netlink_markup_parse_cb); - if (ret < 0) - nftnl_parse_perror("unable to import: parsing failed", err); - - nftnl_parse_err_free(err); - return ret; -} - static int do_list_table(struct netlink_ctx *ctx, struct cmd *cmd, struct table *table) { @@ -2527,9 +2486,9 @@ int do_command(struct netlink_ctx *ctx, struct cmd *cmd) case CMD_RENAME: return do_command_rename(ctx, cmd); case CMD_IMPORT: - return do_command_import(ctx, cmd); case CMD_EXPORT: - return do_command_export(ctx, cmd); + errno = EOPNOTSUPP; + return -1; case CMD_MONITOR: return do_command_monitor(ctx, cmd); case CMD_DESCRIBE: |