diff options
| author | Andrey V. Elsukov <ae@FreeBSD.org> | 2016-03-17 11:10:44 +0000 |
|---|---|---|
| committer | Andrey V. Elsukov <ae@FreeBSD.org> | 2016-03-17 11:10:44 +0000 |
| commit | 3e16fab37bdff582e9e819110305a3c708f7e860 (patch) | |
| tree | 37ce4364b6722e2bc6b67cbcb6f999e5882af9b1 /sys/netinet6 | |
| parent | 04894769f4f1547f7bbcbb7eaff86f1b712d8af6 (diff) | |
| download | src-3e16fab37bdff582e9e819110305a3c708f7e860.tar.gz src-3e16fab37bdff582e9e819110305a3c708f7e860.zip | |
Reduce the number of local variables. Remove redundant check that inp
pointer isn't NULL, it is safe, because we are handling IPV6_PKTINFO
socket option in this block of code. Also, use in6ifa_withaddr() instead
of ifa_withaddr().
Notes
Notes:
svn path=/head/; revision=296986
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/in6_src.c | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c index 97347bc77ace..40b4723a1d59 100644 --- a/sys/netinet6/in6_src.c +++ b/sys/netinet6/in6_src.c @@ -226,9 +226,6 @@ in6_selectsrc(uint32_t fibnum, struct sockaddr_in6 *dstsock, */ if (opts && (pi = opts->ip6po_pktinfo) && !IN6_IS_ADDR_UNSPECIFIED(&pi->ipi6_addr)) { - struct sockaddr_in6 srcsock; - struct in6_ifaddr *ia6; - /* get the outgoing interface */ if ((error = in6_selectif(dstsock, opts, mopts, &ifp, oifp, fibnum)) @@ -242,18 +239,14 @@ in6_selectsrc(uint32_t fibnum, struct sockaddr_in6 *dstsock, * the interface must be specified; otherwise, ifa_ifwithaddr() * will fail matching the address. */ - bzero(&srcsock, sizeof(srcsock)); - srcsock.sin6_family = AF_INET6; - srcsock.sin6_len = sizeof(srcsock); - srcsock.sin6_addr = pi->ipi6_addr; + tmp = pi->ipi6_addr; if (ifp) { - error = in6_setscope(&srcsock.sin6_addr, ifp, NULL); + error = in6_setscope(&tmp, ifp, &odstzone); if (error) return (error); } if (cred != NULL && (error = prison_local_ip6(cred, - &srcsock.sin6_addr, (inp != NULL && - (inp->inp_flags & IN6P_IPV6_V6ONLY) != 0))) != 0) + &tmp, (inp->inp_flags & IN6P_IPV6_V6ONLY) != 0)) != 0) return (error); /* @@ -262,19 +255,18 @@ in6_selectsrc(uint32_t fibnum, struct sockaddr_in6 *dstsock, * 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 | + ia = in6ifa_ifwithaddr(&tmp, odstzone); + if (ia == NULL || (ia->ia6_flags & (IN6_IFF_ANYCAST | IN6_IFF_NOTREADY))) { - if (ia6 != NULL) - ifa_free(&ia6->ia_ifa); + if (ia != NULL) + ifa_free(&ia->ia_ifa); return (EADDRNOTAVAIL); } - bcopy(&ia6->ia_addr.sin6_addr, srcp, sizeof(*srcp)); - ifa_free(&ia6->ia_ifa); + bcopy(&ia->ia_addr.sin6_addr, srcp, sizeof(*srcp)); + ifa_free(&ia->ia_ifa); } else - bcopy(&srcsock.sin6_addr, srcp, sizeof(*srcp)); - pi->ipi6_addr = srcsock.sin6_addr; /* XXX: this overrides pi */ + bcopy(&tmp, srcp, sizeof(*srcp)); + pi->ipi6_addr = tmp; /* XXX: this overrides pi */ if (ifpp) *ifpp = ifp; return (0); |