From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: kadlec@netfilter.org
Subject: [PATCH ipset,v4 2/4] lib: Detach restore routine from parser
Date: Fri, 25 Jun 2021 22:30:41 +0200 [thread overview]
Message-ID: <20210625203043.17265-3-pablo@netfilter.org> (raw)
In-Reply-To: <20210625203043.17265-1-pablo@netfilter.org>
Do not call restore() from ipset_parser(). Instead, ipset_parser()
returns the IPSET_CMD_RESTORE command and the caller invokes restore().
This patch comes in preparation for the ipset to nftables translation
infrastructure.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
v4: no changes.
lib/ipset.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/ipset.c b/lib/ipset.c
index 3077f9793f84..5232d8b76c46 100644
--- a/lib/ipset.c
+++ b/lib/ipset.c
@@ -1231,7 +1231,7 @@ ipset_parser(struct ipset *ipset, int oargc, char *oargv[])
return ipset->custom_error(ipset,
p, IPSET_PARAMETER_PROBLEM,
"Unknown argument %s", argv[1]);
- return restore(ipset);
+ return IPSET_CMD_RESTORE;
case IPSET_CMD_ADD:
case IPSET_CMD_DEL:
case IPSET_CMD_TEST:
@@ -1296,6 +1296,9 @@ ipset_parse_argv(struct ipset *ipset, int oargc, char *oargv[])
if (cmd < 0)
return cmd;
+ if (cmd == IPSET_CMD_RESTORE)
+ return restore(ipset);
+
ret = ipset_cmd(session, cmd, ipset->restore_line);
D("ret %d", ret);
/* In the case of warning, the return code is success */
--
2.20.1
next prev parent reply other threads:[~2021-06-25 20:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-25 20:30 [PATCH ipset,v4 0/4] nftables to ipset translation infrastructure Pablo Neira Ayuso
2021-06-25 20:30 ` [PATCH ipset,v4 1/4] lib: split parser from command execution Pablo Neira Ayuso
2021-06-25 20:30 ` Pablo Neira Ayuso [this message]
2021-06-25 20:30 ` [PATCH ipset,v4 3/4] add ipset to nftables translation infrastructure Pablo Neira Ayuso
2021-06-25 20:30 ` [PATCH ipset,v4 4/4] tests: add tests ipset to nftables Pablo Neira Ayuso
2021-06-28 18:26 ` [PATCH ipset,v4 0/4] nftables to ipset translation infrastructure Jozsef Kadlecsik
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=20210625203043.17265-3-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=kadlec@netfilter.org \
--cc=netfilter-devel@vger.kernel.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).