d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reflect ip6_pktopts and ip6_moptions into embeded scope of

Browse Source 
destination address.  it makes `ping6 -I <if> <link-local>'
work again.  since we don't merge scope cleanup yet, we need
this for workaround.
This commit is contained in:
Hajimu UMEMOTO 2003-11-12 21:39:12 +00:00
parent 81dc97109d
commit f4dec803c9
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/netinet6/in6_src.c
View File

@ -173,9 +173,23 @@ in6_selectsrc(dstsock, opts, mopts, ro, laddr, errorp)
struct sockaddr_in6 dstsock0;
dstsock0 = *dstsock;
if ((*errorp = in6_embedscope(&dstsock0.sin6_addr, &dstsock0,
NULL, NULL)) != 0)
return (NULL);
if (IN6_IS_SCOPE_LINKLOCAL(&dstsock0.sin6_addr) ||
IN6_IS_ADDR_MC_INTFACELOCAL(&dstsock0.sin6_addr)) {
/* KAME assumption: link id == interface id */
if (opts && opts->ip6po_pktinfo &&
opts->ip6po_pktinfo->ipi6_ifindex) {
ifp = ifnet_byindex(opts->ip6po_pktinfo->ipi6_ifindex);
dstsock0.sin6_addr.s6_addr16[1] =
htons(opts->ip6po_pktinfo->ipi6_ifindex);
} else if (mopts &&
IN6_IS_ADDR_MULTICAST(&dstsock0.sin6_addr) &&
mopts->im6o_multicast_ifp) {
ifp = mopts->im6o_multicast_ifp;
dstsock0.sin6_addr.s6_addr16[1] = htons(ifp->if_index);
} else if ((*errorp = in6_embedscope(&dstsock0.sin6_addr,
&dstsock0, NULL, NULL)) != 0)
return (NULL);
}
dstsock = &dstsock0;
dst = &dstsock->sin6_addr;