From patchwork Wed Oct 31 09:31:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [iptables-nftables, -, 4/5] iptables: nft: Refactor __nft_rule_check to return rule handle when relevant From: Tomasz Bursztyka X-Patchwork-Id: 195785 Message-Id: <1351675868-14302-5-git-send-email-tomasz.bursztyka@linux.intel.com> To: netfilter-devel@vger.kernel.org Cc: Tomasz Bursztyka Date: Wed, 31 Oct 2012 11:31:07 +0200 Signed-off-by: Tomasz Bursztyka --- 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;