diff options
| author | Phil Sutter <phil@nwl.cc> | 2023-07-15 01:35:39 +0200 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2023-07-28 11:35:04 +0200 |
| commit | bd71c11a95ab2b44794843fd8a3698039a7db211 (patch) | |
| tree | c8559ea9313d57498927171f9eccee9ef824719f /iptables/nft.c | |
| parent | 405ee2c3fea3ebdb8ac2af183db903c81e78f528 (diff) | |
nft: Do not pass nft_rule_ctx to add_nft_among()
It is not used, must be a left-over from an earlier version of the fixed
commit.
Fixes: 4e95200ded923 ("nft-bridge: pass context structure to ops->add() to improve anonymous set support")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'iptables/nft.c')
| -rw-r--r-- | iptables/nft.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/iptables/nft.c b/iptables/nft.c index 230946d3..f453f07a 100644 --- a/iptables/nft.c +++ b/iptables/nft.c @@ -1154,8 +1154,7 @@ gen_lookup(uint32_t sreg, const char *set_name, uint32_t set_id, uint32_t flags) #define NFT_DATATYPE_ETHERADDR 9 static int __add_nft_among(struct nft_handle *h, const char *table, - struct nft_rule_ctx *ctx, struct nftnl_rule *r, - struct nft_among_pair *pairs, + struct nftnl_rule *r, struct nft_among_pair *pairs, int cnt, bool dst, bool inv, bool ip) { uint32_t set_id, type = NFT_DATATYPE_ETHERADDR, len = ETH_ALEN; @@ -1236,7 +1235,7 @@ static int __add_nft_among(struct nft_handle *h, const char *table, return 0; } -static int add_nft_among(struct nft_handle *h, struct nft_rule_ctx *ctx, +static int add_nft_among(struct nft_handle *h, struct nftnl_rule *r, struct xt_entry_match *m) { struct nft_among_data *data = (struct nft_among_data *)m->data; @@ -1252,10 +1251,10 @@ static int add_nft_among(struct nft_handle *h, struct nft_rule_ctx *ctx, } if (data->src.cnt) - __add_nft_among(h, table, ctx, r, data->pairs, data->src.cnt, + __add_nft_among(h, table, r, data->pairs, data->src.cnt, false, data->src.inv, data->src.ip); if (data->dst.cnt) - __add_nft_among(h, table, ctx, r, data->pairs + data->src.cnt, + __add_nft_among(h, table, r, data->pairs + data->src.cnt, data->dst.cnt, true, data->dst.inv, data->dst.ip); return 0; @@ -1476,7 +1475,7 @@ int add_match(struct nft_handle *h, struct nft_rule_ctx *ctx, if (!strcmp(m->u.user.name, "limit")) return add_nft_limit(r, m); else if (!strcmp(m->u.user.name, "among")) - return add_nft_among(h, ctx, r, m); + return add_nft_among(h, r, m); else if (!strcmp(m->u.user.name, "udp")) return add_nft_udp(h, r, m); else if (!strcmp(m->u.user.name, "tcp")) |