diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2013-03-28 00:32:12 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2013-03-28 00:32:12 +0000 |
| commit | 1682209d2280b7c51c61607fe7cb5e272b7ded92 (patch) | |
| tree | 8fcd2b6f34fdee653fb7dc1f67f9c6884376de1c /sys/netinet6/in6_src.c | |
| parent | ef334395d0445f4d18ee8bba08b4532efdca84fc (diff) | |
Unfortunately the satosin, sintosa, ifatoia, satosin6, sin6tosa,
ifatoia6 macros do not check the source type. They just cast
anything. Remove needless casts and do not use those macros if the
source type does not match. Remove duplicate defines.
No binary change. OK kettenis@ krw@
Diffstat (limited to 'sys/netinet6/in6_src.c')
| -rw-r--r-- | sys/netinet6/in6_src.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c index 3068833ac18..69329f23e16 100644 --- a/sys/netinet6/in6_src.c +++ b/sys/netinet6/in6_src.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_src.c,v 1.29 2013/03/20 10:34:12 mpi Exp $ */ +/* $OpenBSD: in6_src.c,v 1.30 2013/03/28 00:32:11 bluhm Exp $ */ /* $KAME: in6_src.c,v 1.36 2001/02/06 04:08:17 itojun Exp $ */ /* @@ -170,7 +170,7 @@ in6_selectsrc(struct sockaddr_in6 *dstsock, struct ip6_pktopts *opts, *errorp = EADDRNOTAVAIL; return (0); } - return (&satosin6(&ia6->ia_addr)->sin6_addr); + return (&ia6->ia_addr.sin6_addr); } /* @@ -194,7 +194,7 @@ in6_selectsrc(struct sockaddr_in6 *dstsock, struct ip6_pktopts *opts, *errorp = EADDRNOTAVAIL; return (0); } - return (&satosin6(&ia6->ia_addr)->sin6_addr); + return (&ia6->ia_addr.sin6_addr); } /* @@ -216,7 +216,7 @@ in6_selectsrc(struct sockaddr_in6 *dstsock, struct ip6_pktopts *opts, *errorp = EADDRNOTAVAIL; return (0); } - return (&satosin6(&ia6->ia_addr)->sin6_addr); + return (&ia6->ia_addr.sin6_addr); } } @@ -242,7 +242,7 @@ in6_selectsrc(struct sockaddr_in6 *dstsock, struct ip6_pktopts *opts, *errorp = EADDRNOTAVAIL; return (0); } - return (&satosin6(&ia6->ia_addr)->sin6_addr); + return (&ia6->ia_addr.sin6_addr); } } @@ -252,7 +252,7 @@ in6_selectsrc(struct sockaddr_in6 *dstsock, struct ip6_pktopts *opts, */ if (ro) { if (ro->ro_rt && ((ro->ro_rt->rt_flags & RTF_UP) == 0 || - !IN6_ARE_ADDR_EQUAL(&satosin6(&ro->ro_dst)->sin6_addr, dst))) { + !IN6_ARE_ADDR_EQUAL(&ro->ro_dst.sin6_addr, dst))) { RTFREE(ro->ro_rt); ro->ro_rt = (struct rtentry *)0; } @@ -303,14 +303,14 @@ in6_selectsrc(struct sockaddr_in6 *dstsock, struct ip6_pktopts *opts, ia6 = ifatoia6(ifa_ifwithnet(sin6tosa(&sin6))); if (ia6 == 0) return (0); - return (&satosin6(&ia6->ia_addr)->sin6_addr); + return (&ia6->ia_addr.sin6_addr); } #endif /* 0 */ if (ia6 == 0) { *errorp = EHOSTUNREACH; /* no route */ return (0); } - return (&satosin6(&ia6->ia_addr)->sin6_addr); + return (&ia6->ia_addr.sin6_addr); } *errorp = EADDRNOTAVAIL; @@ -392,13 +392,13 @@ selectroute(struct sockaddr_in6 *dstsock, struct ip6_pktopts *opts, if ((ron->ro_rt && (ron->ro_rt->rt_flags & (RTF_UP | RTF_GATEWAY)) != RTF_UP) || - !IN6_ARE_ADDR_EQUAL(&satosin6(&ron->ro_dst)->sin6_addr, + !IN6_ARE_ADDR_EQUAL(&ron->ro_dst.sin6_addr, &sin6_next->sin6_addr)) { if (ron->ro_rt) { RTFREE(ron->ro_rt); ron->ro_rt = NULL; } - *satosin6(&ron->ro_dst) = *sin6_next; + ron->ro_dst = *sin6_next; ron->ro_tableid = rtableid; } if (ron->ro_rt == NULL) { @@ -439,8 +439,7 @@ selectroute(struct sockaddr_in6 *dstsock, struct ip6_pktopts *opts, if (ro->ro_rt && (!(ro->ro_rt->rt_flags & RTF_UP) || ((struct sockaddr *)(&ro->ro_dst))->sa_family != AF_INET6 || - !IN6_ARE_ADDR_EQUAL(&satosin6(&ro->ro_dst)->sin6_addr, - dst))) { + !IN6_ARE_ADDR_EQUAL(&ro->ro_dst.sin6_addr, dst))) { RTFREE(ro->ro_rt); ro->ro_rt = (struct rtentry *)NULL; } |