On 21/08/15(Fri) 10:23, David Hill wrote:
> Hello -
>
> second round of casts -> satosin/sintosa
>
> I believe these are the last of the conversions.
ok mpi@
>
> Index: sys/net/if_gif.c
> ===================================================================
> RCS file: /cvs/src/sys/net/if_gif.c,v
> retrieving revision 1.77
> diff -u -p -r1.77 if_gif.c
> --- sys/net/if_gif.c 17 Jul 2015 18:05:59 -0000 1.77
> +++ sys/net/if_gif.c 21 Aug 2015 14:19:26 -0000
> @@ -339,17 +339,17 @@ gif_ioctl(struct ifnet *ifp, u_long cmd,
> case SIOCSLIFPHYADDR:
> switch (cmd) {
> case SIOCSIFPHYADDR:
> - src = (struct sockaddr *)
> - &(((struct in_aliasreq *)data)->ifra_addr);
> - dst = (struct sockaddr *)
> - &(((struct in_aliasreq *)data)->ifra_dstaddr);
> + src = sintosa(
> + &(((struct in_aliasreq *)data)->ifra_addr));
> + dst = sintosa(
> + &(((struct in_aliasreq *)data)->ifra_dstaddr));
> break;
> #ifdef INET6
> case SIOCSIFPHYADDR_IN6:
> - src = (struct sockaddr *)
> - &(((struct in6_aliasreq *)data)->ifra_addr);
> - dst = (struct sockaddr *)
> - &(((struct in6_aliasreq *)data)->ifra_dstaddr);
> + src = sin6tosa(
> + &(((struct in6_aliasreq *)data)->ifra_addr));
> + dst = sin6tosa(
> + &(((struct in6_aliasreq *)data)->ifra_dstaddr));
> break;
> #endif
> case SIOCSLIFPHYADDR:
> @@ -432,10 +432,10 @@ gif_ioctl(struct ifnet *ifp, u_long cmd,
>
> /* can't configure multiple multi-dest interfaces */
> #define multidest(x) \
> - (((struct sockaddr_in *)(x))->sin_addr.s_addr == INADDR_ANY)
> + ((satosin((x)))->sin_addr.s_addr == INADDR_ANY)
> #ifdef INET6
> #define multidest6(x) \
> - (IN6_IS_ADDR_UNSPECIFIED(&((struct sockaddr_in6 *)(x))->sin6_addr))
> + (IN6_IS_ADDR_UNSPECIFIED(&(satosin6((x)))->sin6_addr))
> #endif
> if (dst->sa_family == AF_INET &&
> multidest(dst) && multidest(sc2->gif_pdst)) {
> @@ -501,8 +501,8 @@ gif_ioctl(struct ifnet *ifp, u_long cmd,
> break;
> #ifdef INET6
> case SIOCGIFPSRCADDR_IN6:
> - dst = (struct sockaddr *)
> - &(((struct in6_ifreq *)data)->ifr_addr);
> + dst = sin6tosa(
> + &(((struct in6_ifreq *)data)->ifr_addr));
> size = sizeof(((struct in6_ifreq *)data)->ifr_addr);
> break;
> #endif /* INET6 */
> @@ -531,8 +531,7 @@ gif_ioctl(struct ifnet *ifp, u_long cmd,
> break;
> #ifdef INET6
> case SIOCGIFPDSTADDR_IN6:
> - dst = (struct sockaddr *)
> - &(((struct in6_ifreq *)data)->ifr_addr);
> + dst = sin6tosa(&(((struct in6_ifreq *)data)->ifr_addr));
> size = sizeof(((struct in6_ifreq *)data)->ifr_addr);
> break;
> #endif /* INET6 */
> Index: sys/net/if_tun.c
> ===================================================================
> RCS file: /cvs/src/sys/net/if_tun.c,v
> retrieving revision 1.151
> diff -u -p -r1.151 if_tun.c
> --- sys/net/if_tun.c 20 Jul 2015 22:54:29 -0000 1.151
> +++ sys/net/if_tun.c 21 Aug 2015 14:19:26 -0000
> @@ -446,12 +446,12 @@ tuninit(struct tun_softc *tp)
> if (ifa->ifa_addr->sa_family == AF_INET6) {
> struct sockaddr_in6 *sin;
>
> - sin = (struct sockaddr_in6 *)ifa->ifa_addr;
> + sin = satosin6(ifa->ifa_addr);
> if (!IN6_IS_ADDR_UNSPECIFIED(&sin->sin6_addr))
> tp->tun_flags |= TUN_IASET;
>
> if (ifp->if_flags & IFF_POINTOPOINT) {
> - sin = (struct sockaddr_in6 *)ifa->ifa_dstaddr;
> + sin = satosin6(ifa->ifa_dstaddr);
> if (sin &&
> !IN6_IS_ADDR_UNSPECIFIED(&sin->sin6_addr))
> tp->tun_flags |= TUN_DSTADDR;
> Index: sys/net/pf_osfp.c
> ===================================================================
> RCS file: /cvs/src/sys/net/pf_osfp.c,v
> retrieving revision 1.31
> diff -u -p -r1.31 pf_osfp.c
> --- sys/net/pf_osfp.c 18 Jul 2015 19:19:00 -0000 1.31
> +++ sys/net/pf_osfp.c 21 Aug 2015 14:19:26 -0000
> @@ -142,7 +142,7 @@ pf_osfp_fingerprint_hdr(const struct ip
> sin.sin_family = AF_INET;
> sin.sin_len = sizeof(struct sockaddr_in);
> sin.sin_addr = ip->ip_src;
> - (void)getnameinfo((struct sockaddr *)&sin,
> + (void)getnameinfo(sintosa(&sin),
> sizeof(struct sockaddr_in), srcname, sizeof(srcname),
> NULL, 0, NI_NUMERICHOST);
> #endif /* _KERNEL */
> @@ -165,7 +165,7 @@ pf_osfp_fingerprint_hdr(const struct ip
> sin6.sin6_family = AF_INET6;
> sin6.sin6_len = sizeof(struct sockaddr_in6);
> sin6.sin6_addr = ip6->ip6_src;
> - (void)getnameinfo((struct sockaddr *)&sin6,
> + (void)getnameinfo(sin6tosa(&sin6),
> sizeof(struct sockaddr_in6), srcname, sizeof(srcname),
> NULL, 0, NI_NUMERICHOST);
> #endif /* !_KERNEL */
> Index: sys/net/pipex.c
> ===================================================================
> RCS file: /cvs/src/sys/net/pipex.c,v
> retrieving revision 1.72
> diff -u -p -r1.72 pipex.c
> --- sys/net/pipex.c 16 Jul 2015 16:12:15 -0000 1.72
> +++ sys/net/pipex.c 21 Aug 2015 14:19:26 -0000
> @@ -1741,7 +1741,7 @@ pipex_pptp_userland_lookup_session_ipv4(
> sin4.sin_family = AF_INET;
> sin4.sin_addr = dst;
>
> - return pipex_pptp_userland_lookup_session(m0, (struct sockaddr *)&sin4);
> + return pipex_pptp_userland_lookup_session(m0, sintosa(&sin4));
> }
>
> #ifdef INET6
> @@ -1753,7 +1753,7 @@ pipex_pptp_userland_lookup_session_ipv6(
> sin6.sin6_family = AF_INET6;
> in6_recoverscope(&sin6, &dst, NULL);
>
> - return pipex_pptp_userland_lookup_session(m0, (struct sockaddr *)&sin6);
> + return pipex_pptp_userland_lookup_session(m0, sin6tosa(&sin6));
> }
> #endif
>
> @@ -2173,7 +2173,7 @@ pipex_l2tp_userland_lookup_session_ipv4(
> sin4.sin_family = AF_INET;
> sin4.sin_addr = dst;
>
> - return pipex_l2tp_userland_lookup_session(m0, (struct sockaddr *)&sin4);
> + return pipex_l2tp_userland_lookup_session(m0, sintosa(&sin4));
> }
>
> #ifdef INET6
> @@ -2185,7 +2185,7 @@ pipex_l2tp_userland_lookup_session_ipv6(
> sin6.sin6_family = AF_INET6;
> in6_recoverscope(&sin6, &dst, NULL);
>
> - return pipex_l2tp_userland_lookup_session(m0, (struct sockaddr *)&sin6);
> + return pipex_l2tp_userland_lookup_session(m0, sin6tosa(&sin6));
> }
> #endif
>
> @@ -2951,10 +2951,9 @@ pipex_sockaddr_hash_key(struct sockaddr
> {
> switch (sa->sa_family) {
> case AF_INET:
> - return ntohl(((struct sockaddr_in *)sa)->sin_addr.s_addr);
> + return ntohl(satosin(sa)->sin_addr.s_addr);
> case AF_INET6:
> - return ntohl(((struct sockaddr_in6 *)sa)->sin6_addr
> - .s6_addr32[3]);
> + return ntohl(satosin6(sa)->sin6_addr.s6_addr32[3]);
> }
> panic("pipex_sockaddr_hash_key: unknown address family");
> return (0);
> @@ -2974,16 +2973,15 @@ pipex_sockaddr_compar_addr(struct sockad
> return cmp;
> switch (a->sa_family) {
> case AF_INET:
> - return ((struct sockaddr_in *)b)->sin_addr.s_addr -
> - ((struct sockaddr_in *)a)->sin_addr.s_addr;
> + return (satosin(b)->sin_addr.s_addr -
> + satosin(a)->sin_addr.s_addr);
> case AF_INET6:
> - cmp = ((struct sockaddr_in6 *)b)->sin6_scope_id -
> - ((struct sockaddr_in6 *)a)->sin6_scope_id;
> + cmp = (satosin6(b)->sin6_scope_id - satosin6(a)->sin6_scope_id);
> if (cmp != 0)
> return cmp;
> - return memcmp(&((struct sockaddr_in6 *)a)->sin6_addr,
> - &((struct sockaddr_in6 *)b)->sin6_addr,
> - sizeof(struct in6_addr));
> + return (memcmp(&satosin6(a)->sin6_addr,
> + &satosin6(b)->sin6_addr,
> + sizeof(struct in6_addr)));
> }
> panic("pipex_sockaddr_compar_addr: unknown address family");
>
> Index: sys/net/radix_mpath.c
> ===================================================================
> RCS file: /cvs/src/sys/net/radix_mpath.c,v
> retrieving revision 1.31
> diff -u -p -r1.31 radix_mpath.c
> --- sys/net/radix_mpath.c 18 Jul 2015 15:51:16 -0000 1.31
> +++ sys/net/radix_mpath.c 21 Aug 2015 14:19:26 -0000
> @@ -452,7 +452,7 @@ rn_mpath_hash(struct sockaddr *dst, u_in
> {
> struct sockaddr_in *sin_dst;
>
> - sin_dst = (struct sockaddr_in *)dst;
> + sin_dst = satosin(dst);
> a += sin_dst->sin_addr.s_addr;
> b += srcaddrp ? srcaddrp[0] : 0;
> mix(a, b, c);
> @@ -463,7 +463,7 @@ rn_mpath_hash(struct sockaddr *dst, u_in
> {
> struct sockaddr_in6 *sin6_dst;
>
> - sin6_dst = (struct sockaddr_in6 *)dst;
> + sin6_dst = satosin6(dst);
> a += sin6_dst->sin6_addr.s6_addr32[0];
> b += sin6_dst->sin6_addr.s6_addr32[2];
> c += srcaddrp ? srcaddrp[0] : 0;
> Index: sys/netinet/in_pcb.c
> ===================================================================
> RCS file: /cvs/src/sys/netinet/in_pcb.c,v
> retrieving revision 1.173
> diff -u -p -r1.173 in_pcb.c
> --- sys/netinet/in_pcb.c 19 Aug 2015 13:27:38 -0000 1.173
> +++ sys/netinet/in_pcb.c 21 Aug 2015 14:19:26 -0000
> @@ -896,7 +896,7 @@ in_selectsrc(struct in_addr **insrc, str
> * It is important to zero out the rest of the
> * struct sockaddr_in when mixing v6 & v4!
> */
> - sin2 = (struct sockaddr_in *)&ro->ro_dst;
> + sin2 = satosin(&ro->ro_dst);
> memset(sin2->sin_zero, 0, sizeof(sin2->sin_zero));
> }
> /*
> Index: sys/netinet/ip_divert.c
> ===================================================================
> RCS file: /cvs/src/sys/netinet/ip_divert.c,v
> retrieving revision 1.36
> diff -u -p -r1.36 ip_divert.c
> --- sys/netinet/ip_divert.c 14 Aug 2015 18:07:28 -0000 1.36
> +++ sys/netinet/ip_divert.c 21 Aug 2015 14:19:26 -0000
> @@ -225,7 +225,7 @@ divert_packet(struct mbuf *m, int dir, u
>
> if (inp) {
> sa = inp->inp_socket;
> - if (sbappendaddr(&sa->so_rcv, (struct sockaddr *)&addr,
> + if (sbappendaddr(&sa->so_rcv, sintosa(&addr),
> m, NULL) == 0) {
> divstat.divs_fullsock++;
> m_freem(m);
> Index: sys/netinet/ip_icmp.c
> ===================================================================
> RCS file: /cvs/src/sys/netinet/ip_icmp.c,v
> retrieving revision 1.137
> diff -u -p -r1.137 ip_icmp.c
> --- sys/netinet/ip_icmp.c 14 Aug 2015 18:07:28 -0000 1.137
> +++ sys/netinet/ip_icmp.c 21 Aug 2015 14:19:26 -0000
> @@ -1034,10 +1034,10 @@ icmp_mtudisc_timeout(struct rtentry *rt,
> if ((rt->rt_flags & (RTF_DYNAMIC | RTF_HOST)) ==
> (RTF_DYNAMIC | RTF_HOST)) {
> void *(*ctlfunc)(int, struct sockaddr *, u_int, void *);
> - struct sockaddr_in sa;
> + struct sockaddr_in sin;
> int s;
>
> - sa = *satosin(rt_key(rt));
> + sin = *satosin(rt_key(rt));
>
> s = splsoftnet();
> rtdeletemsg(rt, r->rtt_tableid);
> @@ -1045,7 +1045,7 @@ icmp_mtudisc_timeout(struct rtentry *rt,
> /* Notify TCP layer of increased Path MTU estimate */
> ctlfunc = inetsw[ip_protox[IPPROTO_TCP]].pr_ctlinput;
> if (ctlfunc)
> - (*ctlfunc)(PRC_MTUINC,(struct sockaddr *)&sa,
> + (*ctlfunc)(PRC_MTUINC, sintosa(&sin),
> r->rtt_tableid, NULL);
> splx(s);
> } else
> Index: sys/netinet/ip_mroute.c
> ===================================================================
> RCS file: /cvs/src/sys/netinet/ip_mroute.c,v
> retrieving revision 1.79
> diff -u -p -r1.79 ip_mroute.c
> --- sys/netinet/ip_mroute.c 15 Jul 2015 17:55:08 -0000 1.79
> +++ sys/netinet/ip_mroute.c 21 Aug 2015 14:19:26 -0000
> @@ -2199,7 +2199,7 @@ pim_input(struct mbuf *m, ...)
> reg_vif_num);
> }
> /* NB: vifp was collected above; can it change on us? */
> - looutput(vifp, m, (struct sockaddr *)&dst, NULL);
> + looutput(vifp, m, satosin(&dst), NULL);
>
> /* prepare the register head to send to the mrouting daemon */
> m = mcp;
> Index: sys/netinet/tcp_subr.c
> ===================================================================
> RCS file: /cvs/src/sys/netinet/tcp_subr.c,v
> retrieving revision 1.144
> diff -u -p -r1.144 tcp_subr.c
> --- sys/netinet/tcp_subr.c 16 Jul 2015 16:12:15 -0000 1.144
> +++ sys/netinet/tcp_subr.c 21 Aug 2015 14:19:26 -0000
> @@ -860,8 +860,7 @@ tcp_ctlinput(int cmd, struct sockaddr *s
> sin.sin_family = AF_INET;
> sin.sin_port = th->th_sport;
> sin.sin_addr = ip->ip_src;
> - syn_cache_unreach((struct sockaddr *)&sin,
> - sa, th, rdomain);
> + syn_cache_unreach(sintosa(&sin), sa, th, rdomain);
> }
> } else
> in_pcbnotifyall(&tcbtable, sa, rdomain, errno, notify);
> Index: sys/nfs/nfs_boot.c
> ===================================================================
> RCS file: /cvs/src/sys/nfs/nfs_boot.c,v
> retrieving revision 1.38
> diff -u -p -r1.38 nfs_boot.c
> --- sys/nfs/nfs_boot.c 14 Aug 2015 18:07:28 -0000 1.38
> +++ sys/nfs/nfs_boot.c 21 Aug 2015 14:19:26 -0000
> @@ -242,7 +242,7 @@ nfs_boot_getfh(struct sockaddr_in *bpsin
>
> /* Initialize mount args. */
> memset(args, 0, sizeof(*args));
> - args->addr = (struct sockaddr *)&ndmntp->ndm_saddr;
> + args->addr = sintosa(&ndmntp->ndm_saddr);
> args->addrlen = args->addr->sa_len;
> args->sotype = SOCK_DGRAM;
> args->fh = ndmntp->ndm_fh;
>
