diff options
| author | jhay <jhay@FreeBSD.org> | 2006-09-16 10:27:05 +0000 |
|---|---|---|
| committer | jhay <jhay@FreeBSD.org> | 2006-09-16 10:27:05 +0000 |
| commit | 7748ccf222463de662408b60a0d898405fe6d9f4 (patch) | |
| tree | 8f0556cc6c7e7bcfb92a9baae2711f746fe98899 /sys | |
| parent | 4f982725d1de88af7f42c6b83899fe7e339cfb36 (diff) | |
| download | FreeBSD-src-7748ccf222463de662408b60a0d898405fe6d9f4.zip FreeBSD-src-7748ccf222463de662408b60a0d898405fe6d9f4.tar.gz | |
Handle a list of IPv6 src and dst addresses correctly, eg.
ipfw add allow ip6 from any to 2000::/16,2002::/16
PR: 102422 (part 3)
Submitted by: Andrey V. Elsukov <bu7cher at yandex dot ru>
MFC after: 5 days
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet/ip_fw2.c | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/sys/netinet/ip_fw2.c b/sys/netinet/ip_fw2.c index 4476d35..d08d8de 100644 --- a/sys/netinet/ip_fw2.c +++ b/sys/netinet/ip_fw2.c @@ -2890,22 +2890,25 @@ check_body: &((ipfw_insn_ip6 *)cmd)->addr6); break; case O_IP6_SRC_MASK: - if (is_ipv6) { - ipfw_insn_ip6 *te = (ipfw_insn_ip6 *)cmd; - struct in6_addr p = args->f_id.src_ip6; - - APPLY_MASK(&p, &te->mask6); - match = IN6_ARE_ADDR_EQUAL(&te->addr6, &p); - } - break; - case O_IP6_DST_MASK: if (is_ipv6) { - ipfw_insn_ip6 *te = (ipfw_insn_ip6 *)cmd; - struct in6_addr p = args->f_id.dst_ip6; - - APPLY_MASK(&p, &te->mask6); - match = IN6_ARE_ADDR_EQUAL(&te->addr6, &p); + int i = cmdlen - 1; + struct in6_addr p; + struct in6_addr *d = + &((ipfw_insn_ip6 *)cmd)->addr6; + + for (; !match && i > 0; d += 2, + i -= F_INSN_SIZE(struct in6_addr) + * 2) { + p = (cmd->opcode == + O_IP6_SRC_MASK) ? + args->f_id.src_ip6: + args->f_id.dst_ip6; + APPLY_MASK(&p, &d[1]); + match = + IN6_ARE_ADDR_EQUAL(&d[0], + &p); + } } break; |
