On Fri, Aug 14, 2015 at 10:49:50AM -0400, David Hill wrote:
> Hello -
>
> This replaces casts with the proper satosin/satosin6 calls.
> with bluhm@
OK bluhm@
>
> Index: netinet/in_gif.c
> ===================================================================
> RCS file: /cvs/src/sys/netinet/in_gif.c,v
> retrieving revision 1.45
> diff -u -p -r1.45 in_gif.c
> --- netinet/in_gif.c 16 Jun 2015 11:09:40 -0000 1.45
> +++ netinet/in_gif.c 14 Aug 2015 14:47:25 -0000
> @@ -62,8 +62,8 @@ int
> in_gif_output(struct ifnet *ifp, int family, struct mbuf **m0)
> {
> struct gif_softc *sc = (struct gif_softc*)ifp;
> - struct sockaddr_in *sin_src = (struct sockaddr_in *)sc->gif_psrc;
> - struct sockaddr_in *sin_dst = (struct sockaddr_in *)sc->gif_pdst;
> + struct sockaddr_in *sin_src = satosin(sc->gif_psrc);
> + struct sockaddr_in *sin_dst = satosin(sc->gif_pdst);
> struct tdb tdb;
> struct xformsw xfs;
> int error;
> Index: netinet/ip_divert.c
> ===================================================================
> RCS file: /cvs/src/sys/netinet/ip_divert.c,v
> retrieving revision 1.35
> diff -u -p -r1.35 ip_divert.c
> --- netinet/ip_divert.c 15 Jul 2015 22:16:42 -0000 1.35
> +++ netinet/ip_divert.c 14 Aug 2015 14:47:25 -0000
> @@ -217,7 +217,7 @@ divert_packet(struct mbuf *m, int dir, u
> TAILQ_FOREACH(ifa, &ifp->if_addrlist, ifa_list) {
> if (ifa->ifa_addr->sa_family != AF_INET)
> continue;
> - addr.sin_addr.s_addr = ((struct sockaddr_in *)
> + addr.sin_addr.s_addr = satosin(
> ifa->ifa_addr)->sin_addr.s_addr;
> break;
> }
> Index: netinet/ip_icmp.c
> ===================================================================
> RCS file: /cvs/src/sys/netinet/ip_icmp.c,v
> retrieving revision 1.136
> diff -u -p -r1.136 ip_icmp.c
> --- netinet/ip_icmp.c 16 Jun 2015 11:09:40 -0000 1.136
> +++ netinet/ip_icmp.c 14 Aug 2015 14:47:25 -0000
> @@ -1037,7 +1037,7 @@ icmp_mtudisc_timeout(struct rtentry *rt,
> struct sockaddr_in sa;
> int s;
>
> - sa = *(struct sockaddr_in *)rt_key(rt);
> + sa = *satosin(rt_key(rt));
>
> s = splsoftnet();
> rtdeletemsg(rt, r->rtt_tableid);
> Index: netinet/ip_ipip.c
> ===================================================================
> RCS file: /cvs/src/sys/netinet/ip_ipip.c,v
> retrieving revision 1.63
> diff -u -p -r1.63 ip_ipip.c
> --- netinet/ip_ipip.c 16 Jul 2015 16:12:15 -0000 1.63
> +++ netinet/ip_ipip.c 14 Aug 2015 14:47:25 -0000
> @@ -307,8 +307,7 @@ ipip_input(struct mbuf *m, int iphlen, s
> AF_INET)
> continue;
>
> - sin = (struct sockaddr_in *)
> - ifa->ifa_addr;
> + sin = satosin(ifa->ifa_addr);
> if (sin->sin_addr.s_addr ==
> ipo->ip_src.s_addr) {
> ipipstat.ipips_spoof++;
> @@ -322,8 +321,7 @@ ipip_input(struct mbuf *m, int iphlen, s
> AF_INET6)
> continue;
>
> - sin6 = (struct sockaddr_in6 *)
> - ifa->ifa_addr;
> + sin6 = satosin6(ifa->ifa_addr);
> if (IN6_ARE_ADDR_EQUAL(&sin6->sin6_addr,
> &ip6->ip6_src)) {
> ipipstat.ipips_spoof++;
> Index: netinet/udp_usrreq.c
> ===================================================================
> RCS file: /cvs/src/sys/netinet/udp_usrreq.c,v
> retrieving revision 1.204
> diff -u -p -r1.204 udp_usrreq.c
> --- netinet/udp_usrreq.c 15 Jul 2015 22:16:42 -0000 1.204
> +++ netinet/udp_usrreq.c 14 Aug 2015 14:47:25 -0000
> @@ -741,7 +741,7 @@ udp6_ctlinput(int cmd, struct sockaddr *
> ip6 = NULL;
> cmdarg = NULL;
> /* XXX: translate addresses into internal form */
> - sa6 = *(struct sockaddr_in6 *)sa;
> + sa6 = *satosin6(sa);
> if (in6_embedscope(&sa6.sin6_addr, &sa6, NULL, NULL)) {
> /* should be impossible */
> return;
> @@ -762,7 +762,7 @@ udp6_ctlinput(int cmd, struct sockaddr *
> }
> } else {
> /* XXX: translate addresses into internal form */
> - sa6 = *(struct sockaddr_in6 *)sa;
> + sa6 = *satosin6(sa);
> if (in6_embedscope(&sa6.sin6_addr, &sa6, NULL, NULL)) {
> /* should be impossible */
> return;
> Index: nfs/nfs_boot.c
> ===================================================================
> RCS file: /cvs/src/sys/nfs/nfs_boot.c,v
> retrieving revision 1.37
> diff -u -p -r1.37 nfs_boot.c
> --- nfs/nfs_boot.c 15 Jul 2015 22:16:42 -0000 1.37
> +++ nfs/nfs_boot.c 14 Aug 2015 14:47:25 -0000
> @@ -182,7 +182,7 @@ nfs_boot_init(struct nfs_diskless *nd, s
> memset(&ifra, 0, sizeof(ifra));
> bcopy(ifp->if_xname, ifra.ifra_name, sizeof(ifra.ifra_name));
>
> - sin = (struct sockaddr_in *)&ifra.ifra_addr;
> + sin = &ifra.ifra_addr;
> sin->sin_len = sizeof(*sin);
> sin->sin_family = AF_INET;
> sin->sin_addr.s_addr = my_ip.s_addr;
