The only remaining caller that needs this is netlink_dump_ruleset(), that is
used to export the ruleset using markup representation. We can remove it and
handle this from do_command_export() now that we have a centralized point to
build up the object cache.
Signed-off-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
---
src/main.c | 5 -----
src/rule.c | 10 ++++++----
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/main.c b/src/main.c
index d6c9ccc..7bbcfc4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -233,12 +233,7 @@ int nft_run(void *scanner, struct parser_state *state, struct list_head *msgs)
ret = -1;
goto err1;
}
-retry:
ret = nft_netlink(state, msgs);
- if (ret < 0 && errno == EINTR) {
- netlink_restart();
- goto retry;
- }
err1:
list_for_each_entry_safe(cmd, next, &state->cmds, list) {
list_del(&cmd->list);
diff --git a/src/rule.c b/src/rule.c
index 310ff95..d369596 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -942,11 +942,13 @@ 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 nft_ruleset *rs = netlink_dump_ruleset(ctx, &cmd->handle,
- &cmd->location);
+ struct nft_ruleset *rs;
- if (rs == NULL)
- return -1;
+ do {
+ rs = netlink_dump_ruleset(ctx, &cmd->handle, &cmd->location);
+ if (rs == NULL && errno != EINTR)
+ return -1;
+ } while (rs == NULL);
nft_ruleset_fprintf(stdout, rs, cmd->export->format, 0);
fprintf(stdout, "\n");
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
