diff options
| author | Phil Sutter <phil@nwl.cc> | 2018-07-19 18:31:55 +0200 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2018-07-19 22:16:15 +0200 |
| commit | d9c6a5d0977a6d8bbe772dbc31a2c4f58eec1708 (patch) | |
| tree | 6b7530dac45c0bbda47b483d547e71e298168b26 /iptables/nft-shared.h | |
| parent | 87b5b9e2240e7cd5487d160cc3e059c61622ce75 (diff) | |
xtables: merge {ip,arp}tables_command_state structs
Differences between both structs are marginal (apart from
arptables_command_state being much smaller), so merge them into one.
Struct iptables_command_state is already shared between iptables,
ip6tables and ebtables.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'iptables/nft-shared.h')
| -rw-r--r-- | iptables/nft-shared.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/iptables/nft-shared.h b/iptables/nft-shared.h index d74eeb00..18927a29 100644 --- a/iptables/nft-shared.h +++ b/iptables/nft-shared.h @@ -49,7 +49,6 @@ enum { struct nft_xt_ctx { union { struct iptables_command_state *cs; - struct arptables_command_state *cs_arp; } state; struct nftnl_expr_iter *iter; int family; @@ -145,7 +144,7 @@ void nft_parse_meta(struct nft_xt_ctx *ctx, struct nftnl_expr *e); void nft_parse_payload(struct nft_xt_ctx *ctx, struct nftnl_expr *e); void nft_parse_counter(struct nftnl_expr *e, struct xt_counters *counters); void nft_parse_immediate(struct nft_xt_ctx *ctx, struct nftnl_expr *e); -void nft_rule_to_iptables_command_state(struct nftnl_rule *r, +void nft_rule_to_iptables_command_state(const struct nftnl_rule *r, struct iptables_command_state *cs); void print_header(unsigned int format, const char *chain, const char *pol, const struct xt_counters *counters, bool basechain, |