correct behavior when ipv6mr_interface is 0. Matthias Drochner

Notified by:	itojun
Obtained from:	NetBSD
This commit is contained in:
ume 2003-11-06 16:42:59 +00:00
parent bf689a07a0
commit bbea30a3ab

View File

@ -2651,8 +2651,8 @@ ip6_setmoptions(optname, im6op, m)
/* /*
* If the interface is specified, validate it. * If the interface is specified, validate it.
*/ */
if (mreq->ipv6mr_interface < 0 if (mreq->ipv6mr_interface < 0 ||
|| if_index < mreq->ipv6mr_interface) { if_index < mreq->ipv6mr_interface) {
error = ENXIO; /* XXX EINVAL? */ error = ENXIO; /* XXX EINVAL? */
break; break;
} }
@ -2701,8 +2701,8 @@ ip6_setmoptions(optname, im6op, m)
* if the address has link-local scope. * if the address has link-local scope.
*/ */
if (IN6_IS_ADDR_MC_LINKLOCAL(&mreq->ipv6mr_multiaddr)) { if (IN6_IS_ADDR_MC_LINKLOCAL(&mreq->ipv6mr_multiaddr)) {
mreq->ipv6mr_multiaddr.s6_addr16[1] mreq->ipv6mr_multiaddr.s6_addr16[1] =
= htons(mreq->ipv6mr_interface); htons(ifp->if_index);
} }
/* /*
* See if the membership already exists. * See if the membership already exists.