diff options
| author | Andrey V. Elsukov <ae@FreeBSD.org> | 2016-03-17 10:59:30 +0000 |
|---|---|---|
| committer | Andrey V. Elsukov <ae@FreeBSD.org> | 2016-03-17 10:59:30 +0000 |
| commit | 04894769f4f1547f7bbcbb7eaff86f1b712d8af6 (patch) | |
| tree | 7b54af035163ef03ee4e2d002cd151828fd35f42 /sys/netinet6/in6_src.c | |
| parent | 34a72dfaba154e830f302584bbfe2cfc883ff8d1 (diff) | |
| download | src-04894769f4f1547f7bbcbb7eaff86f1b712d8af6.tar.gz src-04894769f4f1547f7bbcbb7eaff86f1b712d8af6.zip | |
Change in6_selectsrc() to allow usage of non-local IPv6 addresses in
IPV6_PKTINFO ancillary data when IPV6_BINDANY socket option is set.
Submitted by: n_hibma
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=296984
Diffstat (limited to 'sys/netinet6/in6_src.c')
| -rw-r--r-- | sys/netinet6/in6_src.c | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c index 402940217d6e..97347bc77ace 100644 --- a/sys/netinet6/in6_src.c +++ b/sys/netinet6/in6_src.c @@ -256,19 +256,27 @@ in6_selectsrc(uint32_t fibnum, struct sockaddr_in6 *dstsock, (inp->inp_flags & IN6P_IPV6_V6ONLY) != 0))) != 0) return (error); - ia6 = (struct in6_ifaddr *)ifa_ifwithaddr( - (struct sockaddr *)&srcsock); - if (ia6 == NULL || - (ia6->ia6_flags & (IN6_IFF_ANYCAST | IN6_IFF_NOTREADY))) { - if (ia6 != NULL) - ifa_free(&ia6->ia_ifa); - return (EADDRNOTAVAIL); - } + /* + * If IPV6_BINDANY socket option is set, we allow to specify + * non local addresses as source address in IPV6_PKTINFO + * ancillary data. + */ + if ((inp->inp_flags & INP_BINDANY) == 0) { + ia6 = (struct in6_ifaddr *)ifa_ifwithaddr( + (struct sockaddr *)&srcsock); + if (ia6 == NULL || (ia6->ia6_flags & (IN6_IFF_ANYCAST | + IN6_IFF_NOTREADY))) { + if (ia6 != NULL) + ifa_free(&ia6->ia_ifa); + return (EADDRNOTAVAIL); + } + bcopy(&ia6->ia_addr.sin6_addr, srcp, sizeof(*srcp)); + ifa_free(&ia6->ia_ifa); + } else + bcopy(&srcsock.sin6_addr, srcp, sizeof(*srcp)); pi->ipi6_addr = srcsock.sin6_addr; /* XXX: this overrides pi */ if (ifpp) *ifpp = ifp; - bcopy(&ia6->ia_addr.sin6_addr, srcp, sizeof(*srcp)); - ifa_free(&ia6->ia_ifa); return (0); } |