diff options
author | Markus Friedl <markus@cvs.openbsd.org> | 2008-10-22 14:36:09 +0000 |
---|---|---|
committer | Markus Friedl <markus@cvs.openbsd.org> | 2008-10-22 14:36:09 +0000 |
commit | 9e247d022c84cdda4546dcd44dc2cdb61c3d136f (patch) | |
tree | d26616199ed614d6a46b41d5789f936885da1f9b /sys/netinet | |
parent | 785de0575d013e89400a9eccbe319eed8f37ccd5 (diff) |
filter ipv6 ipsec packets on enc0 (in and out), similar to ipv4;
ok bluhm, fries, mpf; fixes pr 4188
Diffstat (limited to 'sys/netinet')
-rw-r--r-- | sys/netinet/ipsec_input.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/netinet/ipsec_input.c b/sys/netinet/ipsec_input.c index d91d5e99ac5..1e68064402c 100644 --- a/sys/netinet/ipsec_input.c +++ b/sys/netinet/ipsec_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsec_input.c,v 1.89 2008/08/26 12:18:01 henning Exp $ */ +/* $OpenBSD: ipsec_input.c,v 1.90 2008/10/22 14:36:08 markus Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr) and @@ -237,12 +237,8 @@ ipsec_common_input(struct mbuf *m, int skip, int protoff, int af, int sproto, return ENXIO; } - if (tdbp->tdb_dst.sa.sa_family == AF_INET && - sproto != IPPROTO_IPCOMP) { - /* - * XXX The fragment conflicts with scoped nature of - * IPv6, so do it for only for IPv4 for now. - */ + if (sproto != IPPROTO_IPCOMP) { + /* XXX This conflicts with the scoped nature of IPv6 */ m->m_pkthdr.rcvif = &encif[0].sc_if; } |