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

Keep IPv6 address specified by IPV6_PKTINFO socket option in kernel

Browse Source 
internal form to be able handle link-local IPv6 addresses.

Reported by:	kp
Tested by:	kp
This commit is contained in:
Andrey V. Elsukov 2015-07-03 19:01:38 +00:00
parent 50ad20b383
commit cb207f93ca
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/netinet6/ip6_output.c
View File

@ -2189,12 +2189,14 @@ ip6_getpcbopt(struct ip6_pktopts *pktopt, int optname, struct sockopt *sopt)
switch (optname) {
case IPV6_PKTINFO:
if (pktopt && pktopt->ip6po_pktinfo)
optdata = (void *)pktopt->ip6po_pktinfo;
else {
optdata = (void *)&null_pktinfo;
if (pktopt && pktopt->ip6po_pktinfo) {
bcopy(pktopt->ip6po_pktinfo, &null_pktinfo,
sizeof(null_pktinfo));
in6_clearscope(&null_pktinfo.ipi6_addr);
} else {
/* XXX: we don't have to do this every time... */
bzero(&null_pktinfo, sizeof(null_pktinfo));
optdata = (void *)&null_pktinfo;
}
optdatalen = sizeof(struct in6_pktinfo);
break;
@ -2566,6 +2568,7 @@ ip6_setpktopt(int optname, u_char *buf, int len, struct ip6_pktopts *opt,
!IN6_IS_ADDR_UNSPECIFIED(&pktinfo->ipi6_addr)) {
struct in6_ifaddr *ia;
in6_setscope(&pktinfo->ipi6_addr, ifp, NULL);
ia = in6ifa_ifpwithaddr(ifp, &pktinfo->ipi6_addr);
if (ia == NULL)
return (EADDRNOTAVAIL);