diff options
| author | Phil Sutter <phil@nwl.cc> | 2023-11-14 18:51:59 +0100 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2023-11-29 02:33:01 +0100 |
| commit | 20e95a4ec5cec14d9e03ba562fa65f015d49dc14 (patch) | |
| tree | 1d053079a387a14f2247eff64091c9dadf141a84 /iptables/nft-arp.c | |
| parent | 0f5f2f38baf8de62d2ac81247260d7ee316141aa (diff) | |
xshared: Introduce xt_cmd_parse_ops::option_name
The old opt2char() function was flawed: Since not every field in
optflags contains a printable character, typical use of its return value
in print statements could lead to garbage on screen.
Replace this by a mechanism to retrieve an option's long name which
supports family-specific overrides. and get rid of optflags field
altogether and define NUMBER_OF_OPT similar to NUMBER_OF_CMD.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'iptables/nft-arp.c')
| -rw-r--r-- | iptables/nft-arp.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/iptables/nft-arp.c b/iptables/nft-arp.c index 38b2ab39..6f8e1952 100644 --- a/iptables/nft-arp.c +++ b/iptables/nft-arp.c @@ -815,6 +815,23 @@ static int nft_arp_xlate(const struct iptables_command_state *cs, return xlate_action(cs, false, xl); } +static const char *nft_arp_option_name(int option) +{ + switch (option) { + default: return ip46t_option_name(option); + /* different name than iptables */ + case OPT_SOURCE: return "--source-ip"; + case OPT_DESTINATION: return "--destination-ip"; + /* arptables specific ones */ + case OPT_S_MAC: return "--source-mac"; + case OPT_D_MAC: return "--destination-mac"; + case OPT_H_LENGTH: return "--h-length"; + case OPT_OPCODE: return "--opcode"; + case OPT_H_TYPE: return "--h-type"; + case OPT_P_TYPE: return "--proto-type"; + } +} + struct nft_family_ops nft_family_ops_arp = { .add = nft_arp_add, .is_same = nft_arp_is_same, @@ -826,6 +843,7 @@ struct nft_family_ops nft_family_ops_arp = { .rule_parse = &nft_ruleparse_ops_arp, .cmd_parse = { .post_parse = nft_arp_post_parse, + .option_name = nft_arp_option_name, }, .rule_to_cs = nft_rule_to_iptables_command_state, .init_cs = nft_arp_init_cs, |