CVS commit: src/sys

[Kengo NAKAHARA]

Module Name:    src
Committed By:   knakahara
Date:           Fri Dec 25 06:47:57 UTC 2015

Modified Files:
        src/sys/netinet: in_gif.c
        src/sys/netinet6: in6_gif.c

Log Message:
use satosin{,6} macros instead of casts.


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/netinet/in_gif.c
cvs rdiff -u -r1.63 -r1.64 src/sys/netinet6/in6_gif.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/netinet/in_gif.c
diff -u src/sys/netinet/in_gif.c:1.66 src/sys/netinet/in_gif.c:1.67
--- src/sys/netinet/in_gif.c:1.66	Fri Dec 11 07:59:14 2015
+++ src/sys/netinet/in_gif.c	Fri Dec 25 06:47:56 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: in_gif.c,v 1.66 2015/12/11 07:59:14 knakahara Exp $	*/
+/*	$NetBSD: in_gif.c,v 1.67 2015/12/25 06:47:56 knakahara Exp $	*/
 /*	$KAME: in_gif.c,v 1.66 2001/07/29 04:46:09 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_gif.c,v 1.66 2015/12/11 07:59:14 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_gif.c,v 1.67 2015/12/25 06:47:56 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -96,8 +96,8 @@ in_gif_output(struct ifnet *ifp, int fam
 {
 	struct rtentry *rt;
 	struct gif_softc *sc = ifp->if_softc;
-	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 ip iphdr;	/* capsule IP header, host byte ordered */
 	int proto, error;
 	u_int8_t tos;
@@ -297,8 +297,8 @@ gif_validate4(const struct ip *ip, struc
 	struct sockaddr_in *src, *dst;
 	struct in_ifaddr *ia4;
 
-	src = (struct sockaddr_in *)sc->gif_psrc;
-	dst = (struct sockaddr_in *)sc->gif_pdst;
+	src = satosin(sc->gif_psrc);
+	dst = satosin(sc->gif_pdst);
 
 	/* check for address match */
 	if (src->sin_addr.s_addr != ip->ip_dst.s_addr ||

Index: src/sys/netinet6/in6_gif.c
diff -u src/sys/netinet6/in6_gif.c:1.63 src/sys/netinet6/in6_gif.c:1.64
--- src/sys/netinet6/in6_gif.c:1.63	Fri Dec 11 07:59:14 2015
+++ src/sys/netinet6/in6_gif.c	Fri Dec 25 06:47:57 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: in6_gif.c,v 1.63 2015/12/11 07:59:14 knakahara Exp $	*/
+/*	$NetBSD: in6_gif.c,v 1.64 2015/12/25 06:47:57 knakahara Exp $	*/
 /*	$KAME: in6_gif.c,v 1.62 2001/07/29 04:27:25 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.63 2015/12/11 07:59:14 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.64 2015/12/25 06:47:57 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -90,8 +90,8 @@ in6_gif_output(struct ifnet *ifp, int fa
 {
 	struct rtentry *rt;
 	struct gif_softc *sc = ifp->if_softc;
-	struct sockaddr_in6 *sin6_src = (struct sockaddr_in6 *)sc->gif_psrc;
-	struct sockaddr_in6 *sin6_dst = (struct sockaddr_in6 *)sc->gif_pdst;
+	struct sockaddr_in6 *sin6_src = satosin6(sc->gif_psrc);
+	struct sockaddr_in6 *sin6_dst = satosin6(sc->gif_pdst);
 	struct ip6_hdr *ip6;
 	int proto, error;
 	u_int8_t itos, otos;
@@ -300,8 +300,8 @@ gif_validate6(const struct ip6_hdr *ip6,
 {
 	const struct sockaddr_in6 *src, *dst;
 
-	src = (struct sockaddr_in6 *)sc->gif_psrc;
-	dst = (struct sockaddr_in6 *)sc->gif_pdst;
+	src = satosin6(sc->gif_psrc);
+	dst = satosin6(sc->gif_pdst);
 
 	/* check for address match */
 	if (!IN6_ARE_ADDR_EQUAL(&src->sin6_addr, &ip6->ip6_dst) ||