From: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
To: netfilter-devel@vger.kernel.org
Cc: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
Subject: [iptables-nftables - PATCH 4/5] iptables: nft: Refactor __nft_rule_check to return rule handle when relevant
Date: Wed, 31 Oct 2012 11:31:07 +0200 [thread overview]
Message-ID: <1351675868-14302-5-git-send-email-tomasz.bursztyka@linux.intel.com> (raw)
In-Reply-To: <1351675868-14302-1-git-send-email-tomasz.bursztyka@linux.intel.com>
Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
---
iptables/nft.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/iptables/nft.c b/iptables/nft.c
index dfbffc7..5dfacd8 100644
--- a/iptables/nft.c
+++ b/iptables/nft.c
@@ -2194,7 +2194,7 @@ __nft_rule_del(struct nft_handle *h, struct nft_rule *r)
static int
__nft_rule_check(struct nft_handle *h, const char *chain, const char *table,
struct iptables_command_state *cs,
- bool delete, int rulenum, bool verbose)
+ bool delete, bool replace, int rulenum, bool verbose)
{
struct nft_rule_list *list;
struct nft_rule_list_iter *iter;
@@ -2276,7 +2276,8 @@ next:
if (delete) {
DEBUGP("deleting rule\n");
__nft_rule_del(h, r);
- }
+ } else if (replace)
+ ret = nft_rule_attr_get_u16(r, NFT_RULE_ATTR_HANDLE);
}
nft_rule_list_iter_destroy(iter);
@@ -2294,7 +2295,7 @@ int nft_rule_check(struct nft_handle *h, const char *chain,
{
nft_fn = nft_rule_check;
- return __nft_rule_check(h, chain, table, e, false, -1, verbose);
+ return __nft_rule_check(h, chain, table, e, false, false, -1, verbose);
}
int nft_rule_delete(struct nft_handle *h, const char *chain,
@@ -2303,7 +2304,7 @@ int nft_rule_delete(struct nft_handle *h, const char *chain,
{
nft_fn = nft_rule_delete;
- return __nft_rule_check(h, chain, table, e, true, -1, verbose);
+ return __nft_rule_check(h, chain, table, e, true, false, -1, verbose);
}
int nft_rule_delete_num(struct nft_handle *h, const char *chain,
@@ -2312,7 +2313,8 @@ int nft_rule_delete_num(struct nft_handle *h, const char *chain,
{
nft_fn = nft_rule_delete_num;
- return __nft_rule_check(h, chain, table, NULL, true, rulenum, verbose);
+ return __nft_rule_check(h, chain, table,
+ NULL, true, false, rulenum, verbose);
}
int nft_rule_replace(struct nft_handle *h, const char *chain,
@@ -2323,7 +2325,8 @@ int nft_rule_replace(struct nft_handle *h, const char *chain,
nft_fn = nft_rule_replace;
- ret = __nft_rule_check(h, chain, table, NULL, true, rulenum, verbose);
+ ret = __nft_rule_check(h, chain, table,
+ NULL, false, true, rulenum, verbose);
if (ret < 0)
return ret;
--
1.7.12.4
next prev parent reply other threads:[~2012-10-31 9:31 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-31 9:31 [iptables-nftables - PATCH 0/5] Support for -E and -R options Tomasz Bursztyka
2012-10-31 9:31 ` [iptables-nftables - PATCH 1/5] headers: Make nf_tables.h up to date Tomasz Bursztyka
2012-10-31 9:31 ` [iptables-nftables - PATCH 2/5] nft: Add support for chain rename options (-E) Tomasz Bursztyka
2012-10-31 9:31 ` [iptables-nftables - PATCH 3/5] iptables: nft: Fix -D chain rulenum option Tomasz Bursztyka
2012-10-31 9:31 ` Tomasz Bursztyka [this message]
2012-10-31 9:31 ` [iptables-nftables - PATCH 5/5] iptables: nft: Add support for -R option Tomasz Bursztyka
2012-11-01 15:41 ` [iptables-nftables - PATCH 0/5] Support for -E and -R options Pablo Neira Ayuso
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=1351675868-14302-5-git-send-email-tomasz.bursztyka@linux.intel.com \
--to=tomasz.bursztyka@linux.intel.com \
--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).