diff options
| author | Florian Westphal <fw@strlen.de> | 2023-11-07 12:15:37 +0100 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2023-11-07 23:40:14 +0100 |
| commit | ab2d5f8c7bbeea49d9dddaaf3d2fac8c7fdeae56 (patch) | |
| tree | 1955d437adfe79699370194423de8b4c1ab04769 /iptables | |
| parent | c1083acea70787eea3f7929fd04718434bb05ba8 (diff) | |
nft-arp: add missing mask support
arptables-legacy supports masks for --h-type, --opcode
and --proto-type, but arptables-nft did not.
Add this.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'iptables')
| -rw-r--r-- | iptables/nft-arp.c | 21 | ||||
| -rw-r--r-- | iptables/nft-ruleparse-arp.c | 8 |
2 files changed, 27 insertions, 2 deletions
diff --git a/iptables/nft-arp.c b/iptables/nft-arp.c index 535dd6b8..b3c8dfa4 100644 --- a/iptables/nft-arp.c +++ b/iptables/nft-arp.c @@ -58,41 +58,56 @@ static int nft_arp_add(struct nft_handle *h, struct nft_rule_ctx *ctx, } if (fw->arp.arhrd != 0 || + fw->arp.arhrd_mask != 0xffff || fw->arp.invflags & IPT_INV_ARPHRD) { uint8_t reg; op = nft_invflags2cmp(fw->arp.invflags, IPT_INV_ARPHRD); add_payload(h, r, offsetof(struct arphdr, ar_hrd), 2, NFT_PAYLOAD_NETWORK_HEADER, ®); + if (fw->arp.arhrd_mask != 0xffff) + add_bitwise_u16(h, r, fw->arp.arhrd_mask, 0, reg, ®); add_cmp_u16(r, fw->arp.arhrd, op, reg); } if (fw->arp.arpro != 0 || + fw->arp.arpro_mask != 0xffff || fw->arp.invflags & IPT_INV_PROTO) { uint8_t reg; op = nft_invflags2cmp(fw->arp.invflags, IPT_INV_PROTO); add_payload(h, r, offsetof(struct arphdr, ar_pro), 2, NFT_PAYLOAD_NETWORK_HEADER, ®); + if (fw->arp.arpro_mask != 0xffff) + add_bitwise_u16(h, r, fw->arp.arpro_mask, 0, reg, ®); add_cmp_u16(r, fw->arp.arpro, op, reg); } if (fw->arp.arhln != 0 || + fw->arp.arhln_mask != 255 || fw->arp.invflags & IPT_INV_ARPHLN) { + uint8_t reg; + op = nft_invflags2cmp(fw->arp.invflags, IPT_INV_ARPHLN); - add_proto(h, r, offsetof(struct arphdr, ar_hln), 1, - fw->arp.arhln, op); + add_payload(h, r, offsetof(struct arphdr, ar_hln), 1, + NFT_PAYLOAD_NETWORK_HEADER, ®); + if (fw->arp.arhln_mask != 255) + add_bitwise(h, r, &fw->arp.arhln_mask, 1, reg, ®); + add_cmp_u8(r, fw->arp.arhln, op, reg); } add_proto(h, r, offsetof(struct arphdr, ar_pln), 1, 4, NFT_CMP_EQ); if (fw->arp.arpop != 0 || + fw->arp.arpop_mask != 0xffff || fw->arp.invflags & IPT_INV_ARPOP) { uint8_t reg; op = nft_invflags2cmp(fw->arp.invflags, IPT_INV_ARPOP); add_payload(h, r, offsetof(struct arphdr, ar_op), 2, NFT_PAYLOAD_NETWORK_HEADER, ®); + if (fw->arp.arpop_mask != 0xffff) + add_bitwise_u16(h, r, fw->arp.arpop_mask, 0, reg, ®); add_cmp_u16(r, fw->arp.arpop, op, reg); } @@ -556,6 +571,8 @@ static void nft_arp_init_cs(struct iptables_command_state *cs) cs->arp.arp.arhln_mask = 255; cs->arp.arp.arhrd = htons(ARPHRD_ETHER); cs->arp.arp.arhrd_mask = 65535; + cs->arp.arp.arpop_mask = 65535; + cs->arp.arp.arpro_mask = 65535; } static int diff --git a/iptables/nft-ruleparse-arp.c b/iptables/nft-ruleparse-arp.c index d80ca922..cd74747e 100644 --- a/iptables/nft-ruleparse-arp.c +++ b/iptables/nft-ruleparse-arp.c @@ -90,6 +90,8 @@ static void nft_arp_parse_payload(struct nft_xt_ctx *ctx, fw->arp.arhrd_mask = 0xffff; if (inv) fw->arp.invflags |= IPT_INV_ARPHRD; + if (reg->bitwise.set) + fw->arp.arhrd_mask = reg->bitwise.mask[0]; break; case offsetof(struct arphdr, ar_pro): get_cmp_data(e, &ar_pro, sizeof(ar_pro), &inv); @@ -97,6 +99,8 @@ static void nft_arp_parse_payload(struct nft_xt_ctx *ctx, fw->arp.arpro_mask = 0xffff; if (inv) fw->arp.invflags |= IPT_INV_PROTO; + if (reg->bitwise.set) + fw->arp.arpro_mask = reg->bitwise.mask[0]; break; case offsetof(struct arphdr, ar_op): get_cmp_data(e, &ar_op, sizeof(ar_op), &inv); @@ -104,6 +108,8 @@ static void nft_arp_parse_payload(struct nft_xt_ctx *ctx, fw->arp.arpop_mask = 0xffff; if (inv) fw->arp.invflags |= IPT_INV_ARPOP; + if (reg->bitwise.set) + fw->arp.arpop_mask = reg->bitwise.mask[0]; break; case offsetof(struct arphdr, ar_hln): get_cmp_data(e, &ar_hln, sizeof(ar_hln), &inv); @@ -111,6 +117,8 @@ static void nft_arp_parse_payload(struct nft_xt_ctx *ctx, fw->arp.arhln_mask = 0xff; if (inv) fw->arp.invflags |= IPT_INV_ARPHLN; + if (reg->bitwise.set) + fw->arp.arhln_mask = reg->bitwise.mask[0]; break; case offsetof(struct arphdr, ar_pln): get_cmp_data(e, &ar_pln, sizeof(ar_pln), &inv); |