diff options
author | Phil Sutter <phil@nwl.cc> | 2020-05-07 18:53:47 +0200 |
---|---|---|
committer | Phil Sutter <phil@nwl.cc> | 2020-05-18 17:40:13 +0200 |
commit | e7b6180fcf9061852a06f6d98e7618f44fd0eeec (patch) | |
tree | 3c03880309951d216dfb8d23fe8cd6a3875b583f /iptables/nft.c | |
parent | 3e09bd1888575cfec136574d2b0e810ba33f1cfb (diff) |
nft: Merge nft_*_rule_find() functions
Both ebtables and arptables are fine with using nft_ipv46_rule_find()
instead of their own implementations. Take the chance and move the
former into nft.c as a static helper since it is used in a single place,
only. Then get rid of the callback from family_ops.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'iptables/nft.c')
-rw-r--r-- | iptables/nft.c | 41 |
1 files changed, 40 insertions, 1 deletions
diff --git a/iptables/nft.c b/iptables/nft.c index 3c0daa8d..e65eb91c 100644 --- a/iptables/nft.c +++ b/iptables/nft.c @@ -2120,6 +2120,45 @@ static int __nft_rule_del(struct nft_handle *h, struct nftnl_rule *r) return 1; } +static bool nft_rule_cmp(struct nft_handle *h, struct nftnl_rule *r, + struct nftnl_rule *rule) +{ + struct iptables_command_state _cs = {}, this = {}, *cs = &_cs; + bool ret = false; + + h->ops->rule_to_cs(h, r, &this); + h->ops->rule_to_cs(h, rule, cs); + + DEBUGP("comparing with... "); +#ifdef DEBUG_DEL + nft_rule_print_save(h, r, NFT_RULE_APPEND, 0); +#endif + if (!h->ops->is_same(cs, &this)) + goto out; + + if (!compare_matches(cs->matches, this.matches)) { + DEBUGP("Different matches\n"); + goto out; + } + + if (!compare_targets(cs->target, this.target)) { + DEBUGP("Different target\n"); + goto out; + } + + if ((!cs->target || !this.target) && + strcmp(cs->jumpto, this.jumpto) != 0) { + DEBUGP("Different verdict\n"); + goto out; + } + + ret = true; +out: + h->ops->clear_cs(&this); + h->ops->clear_cs(cs); + return ret; +} + static struct nftnl_rule * nft_rule_find(struct nft_handle *h, struct nftnl_chain *c, struct nftnl_rule *rule, int rulenum) @@ -2138,7 +2177,7 @@ nft_rule_find(struct nft_handle *h, struct nftnl_chain *c, r = nftnl_rule_iter_next(iter); while (r != NULL) { - found = h->ops->rule_find(h, r, rule); + found = nft_rule_cmp(h, r, rule); if (found) break; r = nftnl_rule_iter_next(iter); |