82c82
< __FBSDID("$FreeBSD: head/sys/netinet6/ip6_mroute.c 190012 2009-03-19 01:43:03Z bms $");
---
> __FBSDID("$FreeBSD: head/sys/netinet6/ip6_mroute.c 191672 2009-04-29 19:19:13Z bms $");
95a96
> #include <sys/domain.h>
142a144
> extern int in6_mcast_loop;
370c372
< if (so != ip6_mrouter && sopt->sopt_name != MRT6_INIT)
---
> if (so != V_ip6_mrouter && sopt->sopt_name != MRT6_INIT)
435c437
< if (so != ip6_mrouter)
---
> if (so != V_ip6_mrouter)
563c565
< if (ip6_mrouter != NULL) {
---
> if (V_ip6_mrouter != NULL) {
568c570
< ip6_mrouter = so;
---
> V_ip6_mrouter = so;
604c606
< if (ip6_mrouter == NULL) {
---
> if (V_ip6_mrouter == NULL) {
660c662
< ip6_mrouter = NULL;
---
> V_ip6_mrouter = NULL;
1296c1298
< if (socket_send(ip6_mrouter, mm, &sin6) < 0) {
---
> if (socket_send(V_ip6_mrouter, mm, &sin6) < 0) {
1534c1536
< if (socket_send(ip6_mrouter, mm, &sin6) < 0) {
---
> if (socket_send(V_ip6_mrouter, mm, &sin6) < 0) {
1606d1607
< struct in6_multi *in6m;
1609a1611,1612
> dst6 = &mifp->m6_route.ro_dst;
>
1651,1652c1654,1655
< * If we belong to the destination multicast group
< * on the outgoing interface, loop back a copy.
---
> * If configured to loop back multicasts by default,
> * loop back a copy now.
1654,1656c1657
< dst6 = &mifp->m6_route.ro_dst;
< IN6_LOOKUP_MULTI(ip6->ip6_dst, ifp, in6m);
< if (in6m != NULL) {
---
> if (in6_mcast_loop) {
1661a1663
>
1762c1764
< if (socket_send(ip6_mrouter, mm, &sin6) < 0) {
---
> if (socket_send(V_ip6_mrouter, mm, &sin6) < 0) {
2059c2061
< if (ip6_mrouter != NULL)
---
> if (V_ip6_mrouter != NULL)