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@

8 files changed, 28 insertions, 32 deletions

diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c
index 7a9eeee4a49..3782982050c 100644
--- a/sys/net/if_gre.c
+++ b/sys/net/if_gre.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: if_gre.c,v 1.59 2012/11/23 20:12:03 sthen Exp $ */
+/*      $OpenBSD: if_gre.c,v 1.60 2013/03/28 00:32:11 bluhm Exp $ */
 /*	$NetBSD: if_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */
 
 /*
@@ -600,9 +600,8 @@ recompute:
 			error = EINVAL;
 			break;
 		}
-		sc->g_src = (satosin((struct sockadrr *)&lifr->addr))->sin_addr;
-		sc->g_dst =
-		    (satosin((struct sockadrr *)&lifr->dstaddr))->sin_addr;
+		sc->g_src = ((struct sockaddr_in *)&lifr->addr)->sin_addr;
+		sc->g_dst = ((struct sockaddr_in *)&lifr->dstaddr)->sin_addr;
 		goto recompute;
 	case SIOCDIFPHYADDR:
 		if ((error = suser(prc, 0)) != 0)
diff --git a/sys/net/pf.c b/sys/net/pf.c
index d8d63f348db..d4f9471db97 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.c,v 1.819 2013/03/11 19:48:40 sthen Exp $ */
+/*	$OpenBSD: pf.c,v 1.820 2013/03/28 00:32:11 bluhm Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -5730,7 +5730,7 @@ pf_routable(struct pf_addr *addr, sa_family_t af, struct pfi_kif *kif,
 	switch (af) {
 #ifdef INET
 	case AF_INET:
-		dst = satosin(&ro.ro_dst);
+		dst = (struct sockaddr_in *)&ro.ro_dst;
 		dst->sin_family = AF_INET;
 		dst->sin_len = sizeof(*dst);
 		dst->sin_addr = addr->v4;
@@ -5746,7 +5746,7 @@ pf_routable(struct pf_addr *addr, sa_family_t af, struct pfi_kif *kif,
 		 */
 		if (IN6_IS_SCOPE_EMBED(&addr->v6))
 			goto out;
-		dst6 = (struct sockaddr_in6 *)&ro.ro_dst;
+		dst6 = &ro.ro_dst;
 		dst6->sin6_family = AF_INET6;
 		dst6->sin6_len = sizeof(*dst6);
 		dst6->sin6_addr = addr->v6;
@@ -5811,7 +5811,7 @@ pf_rtlabel_match(struct pf_addr *addr, sa_family_t af, struct pf_addr_wrap *aw,
 	switch (af) {
 #ifdef INET
 	case AF_INET:
-		dst = satosin(&ro.ro_dst);
+		dst = (struct sockaddr_in *)(&ro.ro_dst);
 		dst->sin_family = AF_INET;
 		dst->sin_len = sizeof(*dst);
 		dst->sin_addr = addr->v4;
@@ -5819,7 +5819,7 @@ pf_rtlabel_match(struct pf_addr *addr, sa_family_t af, struct pf_addr_wrap *aw,
 #endif /* INET */
 #ifdef INET6
 	case AF_INET6:
-		dst6 = (struct sockaddr_in6 *)&ro.ro_dst;
+		dst6 = &ro.ro_dst;
 		dst6->sin6_family = AF_INET6;
 		dst6->sin6_len = sizeof(*dst6);
 		dst6->sin6_addr = addr->v6;
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index 5290899c4e4..d1d849be42b 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ether.c,v 1.98 2013/03/22 01:41:12 tedu Exp $	*/
+/*	$OpenBSD: if_ether.c,v 1.99 2013/03/28 00:32:11 bluhm Exp $	*/
 /*	$NetBSD: if_ether.c,v 1.31 1996/05/11 12:59:58 mycroft Exp $	*/
 
 /*
@@ -829,7 +829,7 @@ arplookup(u_int32_t addr, int create, int proxy, u_int tableid)
 	sin.sin_family = AF_INET;
 	sin.sin_addr.s_addr = addr;
 	sin.sin_other = proxy ? SIN_PROXY : 0;
-	rt = rtalloc1(sintosa(&sin), create, tableid);
+	rt = rtalloc1((struct sockaddr *)&sin, create, tableid);
 	if (rt == 0)
 		return (0);
 	rt->rt_refcnt--;
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index 0ebac884c68..cc83efeafbf 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_pcb.c,v 1.131 2013/02/05 19:09:52 bluhm Exp $	*/
+/*	$OpenBSD: in_pcb.c,v 1.132 2013/03/28 00:32:11 bluhm Exp $	*/
 /*	$NetBSD: in_pcb.c,v 1.25 1996/02/13 23:41:53 christos Exp $	*/
 
 /*
@@ -810,7 +810,7 @@ in_selectsrc(struct sockaddr_in *sin, struct route *ro, int soopts,
 				*errorp = EADDRNOTAVAIL;
 				return NULL;
 			}
-			return satosin(&ia->ia_addr);
+			return (&ia->ia_addr);
 		}
 	}
 	/*
@@ -863,7 +863,7 @@ in_selectsrc(struct sockaddr_in *sin, struct route *ro, int soopts,
 			return NULL;
 		}
 	}
-	return satosin(&ia->ia_addr);
+	return (&ia->ia_addr);
 }
 
 void
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index e55f1f2d14c..3d8f38a3137 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_input.c,v 1.202 2013/03/26 13:19:26 mpi Exp $	*/
+/*	$OpenBSD: ip_input.c,v 1.203 2013/03/28 00:32:11 bluhm Exp $	*/
 /*	$NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $	*/
 
 /*
@@ -1297,7 +1297,7 @@ ip_weadvertise(u_int32_t addr, u_int rtableid)
 	sin.sin_family = AF_INET;
 	sin.sin_addr.s_addr = addr;
 	sin.sin_other = SIN_PROXY;
-	rt = rtalloc1(sintosa(&sin), 0, rtableid);
+	rt = rtalloc1((struct sockaddr *)&sin, 0, rtableid);
 	if (rt == 0)
 		return 0;
 
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;
 		}
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 9ec2f19239d..e74556151f1 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_output.c,v 1.135 2013/03/20 10:34:12 mpi Exp $	*/
+/*	$OpenBSD: ip6_output.c,v 1.136 2013/03/28 00:32:11 bluhm Exp $	*/
 /*	$KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $	*/
 
 /*
@@ -2116,7 +2116,6 @@ ip6_initpktopts(struct ip6_pktopts *opt)
 	opt->ip6po_minmtu = IP6PO_MINMTU_MCASTONLY;
 }
 
-#define sin6tosa(sin6)	((struct sockaddr *)(sin6)) /* XXX */
 int
 ip6_pcbopt(int optname, u_char *buf, int len, struct ip6_pktopts **pktopt,
     int priv, int uproto)
diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c
index 75de86c75de..c5b6f394514 100644
--- a/sys/netinet6/raw_ip6.c
+++ b/sys/netinet6/raw_ip6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: raw_ip6.c,v 1.47 2013/03/14 11:18:37 mpi Exp $	*/
+/*	$OpenBSD: raw_ip6.c,v 1.48 2013/03/28 00:32:11 bluhm Exp $	*/
 /*	$KAME: raw_ip6.c,v 1.69 2001/03/04 15:55:44 itojun Exp $	*/
 
 /*
@@ -121,7 +121,6 @@
 #define in6_rtchange	in_rtchange
 
 struct	inpcbtable rawin6pcbtable;
-#define ifatoia6(ifa)	((struct in6_ifaddr *)(ifa))
 
 struct rip6stat rip6stat;