diff options
| author | Florian Westphal <fw@strlen.de> | 2018-05-08 11:37:46 +0200 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2018-05-10 02:31:05 +0200 |
| commit | 3d9f300a2175c3997176d4b39f8602367fa4d1ff (patch) | |
| tree | 501f0146120d28a5b0d4870ea4c1dcd13b45bba9 /iptables | |
| parent | 20e2758d95d274945584065b5f16883ffd9d8581 (diff) | |
xtables-compat: ebtables: remove interface masks from ebt_entry struct
They don't exist in the legacy ABI, so don't pretend otherwise.
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'iptables')
| -rw-r--r-- | iptables/nft-bridge.c | 10 | ||||
| -rw-r--r-- | iptables/xshared.h | 3 |
2 files changed, 1 insertions, 12 deletions
diff --git a/iptables/nft-bridge.c b/iptables/nft-bridge.c index 162a87e0..fcc51646 100644 --- a/iptables/nft-bridge.c +++ b/iptables/nft-bridge.c @@ -406,7 +406,6 @@ static void print_matches_and_watchers(const struct iptables_command_state *cs, } } - static void nft_bridge_print_firewall(struct nftnl_rule *r, unsigned int num, unsigned int format) { @@ -547,14 +546,7 @@ static bool nft_bridge_is_same(const void *data_a, const void *data_b) } } - return is_same_interfaces((char *)a->in, - (char *)a->out, - a->in_mask, - a->out_mask, - (char *)b->in, - (char *)b->out, - b->in_mask, - b->out_mask); + return strcmp(a->in, b->in) == 0 && strcmp(a->out, b->out) == 0; } static bool nft_bridge_rule_find(struct nft_family_ops *ops, struct nftnl_rule *r, diff --git a/iptables/xshared.h b/iptables/xshared.h index cec5a08a..01c0eb12 100644 --- a/iptables/xshared.h +++ b/iptables/xshared.h @@ -76,9 +76,6 @@ struct ebt_entry { unsigned char sourcemsk[6]; unsigned char destmac[6]; unsigned char destmsk[6]; - - unsigned char in_mask[IFNAMSIZ]; - unsigned char out_mask[IFNAMSIZ]; }; struct iptables_command_state { |