Module Name: src
Committed By: ozaki-r
Date: Fri Jul 15 07:33:41 UTC 2016
Modified Files:
src/sys/netinet6: icmp6.c in6_pcb.c in6_src.c raw_ip6.c
Log Message:
Use ifatoia6 macro
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.192 -r1.193 src/sys/netinet6/icmp6.c
cvs rdiff -u -r1.145 -r1.146 src/sys/netinet6/in6_pcb.c
cvs rdiff -u -r1.63 -r1.64 src/sys/netinet6/in6_src.c
cvs rdiff -u -r1.146 -r1.147 src/sys/netinet6/raw_ip6.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/netinet6/icmp6.c
diff -u src/sys/netinet6/icmp6.c:1.192 src/sys/netinet6/icmp6.c:1.193
--- src/sys/netinet6/icmp6.c:1.192 Thu Jul 7 09:32:03 2016
+++ src/sys/netinet6/icmp6.c Fri Jul 15 07:33:41 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp6.c,v 1.192 2016/07/07 09:32:03 ozaki-r Exp $ */
+/* $NetBSD: icmp6.c,v 1.193 2016/07/15 07:33:41 ozaki-r Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.192 2016/07/07 09:32:03 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.193 2016/07/15 07:33:41 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2071,7 +2071,7 @@ icmp6_reflect(struct mbuf *m, size_t off
sockaddr_in6_init(&u.sin6, &origdst, 0, 0, 0);
- ia = (struct in6_ifaddr *)ifa_ifwithaddr(&u.sa);
+ ia = ifatoia6(ifa_ifwithaddr(&u.sa));
if (ia == NULL)
;
Index: src/sys/netinet6/in6_pcb.c
diff -u src/sys/netinet6/in6_pcb.c:1.145 src/sys/netinet6/in6_pcb.c:1.146
--- src/sys/netinet6/in6_pcb.c:1.145 Tue Jun 21 10:25:27 2016
+++ src/sys/netinet6/in6_pcb.c Fri Jul 15 07:33:41 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_pcb.c,v 1.145 2016/06/21 10:25:27 ozaki-r Exp $ */
+/* $NetBSD: in6_pcb.c,v 1.146 2016/07/15 07:33:41 ozaki-r Exp $ */
/* $KAME: in6_pcb.c,v 1.84 2001/02/08 18:02:08 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.145 2016/06/21 10:25:27 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.146 2016/07/15 07:33:41 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -257,7 +257,7 @@ in6_pcbbind_addr(struct in6pcb *in6p, st
* deprecated addresses (default: forbid bind(2)).
*/
if (ia &&
- ((struct in6_ifaddr *)ia)->ia6_flags &
+ ifatoia6(ia)->ia6_flags &
(IN6_IFF_ANYCAST|IN6_IFF_NOTREADY|IN6_IFF_DETACHED))
return (EADDRNOTAVAIL);
}
Index: src/sys/netinet6/in6_src.c
diff -u src/sys/netinet6/in6_src.c:1.63 src/sys/netinet6/in6_src.c:1.64
--- src/sys/netinet6/in6_src.c:1.63 Mon Jul 4 06:48:14 2016
+++ src/sys/netinet6/in6_src.c Fri Jul 15 07:33:41 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_src.c,v 1.63 2016/07/04 06:48:14 ozaki-r Exp $ */
+/* $NetBSD: in6_src.c,v 1.64 2016/07/15 07:33:41 ozaki-r Exp $ */
/* $KAME: in6_src.c,v 1.159 2005/10/19 01:40:32 t-momose Exp $ */
/*
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_src.c,v 1.63 2016/07/04 06:48:14 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_src.c,v 1.64 2016/07/15 07:33:41 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -240,7 +240,7 @@ in6_selectsrc(struct sockaddr_in6 *dstso
goto exit;
}
- ia6 = (struct in6_ifaddr *)ifa_ifwithaddr((struct sockaddr *)(&srcsock));
+ ia6 = ifatoia6(ifa_ifwithaddr((struct sockaddr *)(&srcsock)));
if (ia6 == NULL ||
(ia6->ia6_flags & (IN6_IFF_ANYCAST | IN6_IFF_NOTREADY))) {
*errorp = EADDRNOTAVAIL;
Index: src/sys/netinet6/raw_ip6.c
diff -u src/sys/netinet6/raw_ip6.c:1.146 src/sys/netinet6/raw_ip6.c:1.147
--- src/sys/netinet6/raw_ip6.c:1.146 Tue Jun 21 10:25:27 2016
+++ src/sys/netinet6/raw_ip6.c Fri Jul 15 07:33:41 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_ip6.c,v 1.146 2016/06/21 10:25:27 ozaki-r Exp $ */
+/* $NetBSD: raw_ip6.c,v 1.147 2016/07/15 07:33:41 ozaki-r Exp $ */
/* $KAME: raw_ip6.c,v 1.82 2001/07/23 18:57:56 jinmei Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.146 2016/06/21 10:25:27 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.147 2016/07/15 07:33:41 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -695,7 +695,7 @@ rip6_bind(struct socket *so, struct sock
if (!IN6_IS_ADDR_UNSPECIFIED(&addr->sin6_addr) &&
(ia = ifa_ifwithaddr((struct sockaddr *)addr)) == 0)
return EADDRNOTAVAIL;
- if (ia && ((struct in6_ifaddr *)ia)->ia6_flags &
+ if (ia && ifatoia6(ia)->ia6_flags &
(IN6_IFF_ANYCAST|IN6_IFF_NOTREADY|
IN6_IFF_DETACHED|IN6_IFF_DEPRECATED))
return EADDRNOTAVAIL;
