diff options
| author | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2012-01-28 14:07:03 +0000 |
|---|---|---|
| committer | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2012-01-28 14:07:03 +0000 |
| commit | 8d0a8eccf3789619d510795165bec8c545480a72 (patch) | |
| tree | 54fd8ec08dfced5b78965649676422a24f51acf3 | |
| parent | 083e4935162f97e8fd66dde47e6e55a1f73eb854 (diff) | |
improve icmp virtual id generation for ND and MLD packets so that
two consecutive host addresses won't generate the same value which
is used as a port number in state entries; ok bluhm, sperreault
| -rw-r--r-- | sys/net/pf.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c index b138a8db3d9..8e9f2bd2f2a 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.799 2012/01/28 14:00:06 mikeb Exp $ */ +/* $OpenBSD: pf.c,v 1.800 2012/01/28 14:07:02 mikeb Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1768,13 +1768,15 @@ pf_icmp_mapping(struct pf_pdesc *pd, u_int8_t type, *icmp_dir = PF_IN; case MLD_LISTENER_REPORT: { struct mld_hdr *mld = (void *)pd->hdr.icmp6; + u_int32_t h; *virtual_type = MLD_LISTENER_QUERY; /* generate fake id for these messages */ - *virtual_id = (mld->mld_addr.s6_addr32[0] ^ - mld->mld_addr.s6_addr32[1] ^ - mld->mld_addr.s6_addr32[2] ^ - mld->mld_addr.s6_addr32[3]) & 0xffff; + h = mld->mld_addr.s6_addr32[0] ^ + mld->mld_addr.s6_addr32[1] ^ + mld->mld_addr.s6_addr32[2] ^ + mld->mld_addr.s6_addr32[3]; + *virtual_id = (h >> 16) ^ (h & 0xffff); break; } @@ -1800,14 +1802,16 @@ pf_icmp_mapping(struct pf_pdesc *pd, u_int8_t type, *icmp_dir = PF_IN; case ND_NEIGHBOR_ADVERT: { struct nd_neighbor_solicit *nd = (void *)pd->hdr.icmp6; + u_int32_t h; *virtual_type = ND_NEIGHBOR_SOLICIT; *multi = PF_ICMP_MULTI_SOLICITED; /* generate fake id for these messages */ - *virtual_id = (nd->nd_ns_target.s6_addr32[0] ^ - nd->nd_ns_target.s6_addr32[1] ^ - nd->nd_ns_target.s6_addr32[2] ^ - nd->nd_ns_target.s6_addr32[3]) & 0xffff; + h = nd->nd_ns_target.s6_addr32[0] ^ + nd->nd_ns_target.s6_addr32[1] ^ + nd->nd_ns_target.s6_addr32[2] ^ + nd->nd_ns_target.s6_addr32[3]; + *virtual_id = (h >> 16) ^ (h & 0xffff); break; } |