diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2006-05-27 23:40:28 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2006-05-27 23:40:28 +0000 |
| commit | ffb047ab64e1f172ef9a9ae36b8a06fdb69ef5f1 (patch) | |
| tree | 6a78948349036845e06312619666ba18ce585a6d /sys/netinet6/ip6_output.c | |
| parent | eb1ca9bf83835afa564afb5fe71fde464a770b69 (diff) | |
Do the same thing as for IPv4. Use a sysctl to enable/disable mfrowarding
and additionaly make the code part of the MROUTING option. Put it in deraadt@
Diffstat (limited to 'sys/netinet6/ip6_output.c')
| -rw-r--r-- | sys/netinet6/ip6_output.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index 31972159f45..ed33e5e171a 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_output.c,v 1.88 2006/03/05 21:48:57 miod Exp $ */ +/* $OpenBSD: ip6_output.c,v 1.89 2006/05/27 23:40:27 claudio Exp $ */ /* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */ /* @@ -673,12 +673,15 @@ ip6_output(m0, opt, ro, flags, im6o, ifpp) * above, will be forwarded by the ip6_input() routine, * if necessary. */ - if (ip6_mrouter && (flags & IPV6_FORWARDING) == 0) { +#ifdef MROUTING + if (ip6_mforwarding && ip6_mrouter && + (flags & IPV6_FORWARDING) == 0) { if (ip6_mforward(ip6, ifp, m) != 0) { m_freem(m); goto done; } } +#endif } /* * Multicasts with a hoplimit of zero may be looped back, |