CVS commit: src/sys

[Ryota Ozaki]

Module Name:    src
Committed By:   ozaki-r
Date:           Fri Jul  8 03:40:34 UTC 2016

Modified Files:
        src/sys/netinet: in_var.h
        src/sys/netinet6: in6_var.h

Log Message:
Kill remaining use of the old lists of IP addresses


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/netinet/in_var.h
cvs rdiff -u -r1.81 -r1.82 src/sys/netinet6/in6_var.h

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_var.h
diff -u src/sys/netinet/in_var.h:1.76 src/sys/netinet/in_var.h:1.77
--- src/sys/netinet/in_var.h:1.76	Wed Jul  6 08:42:34 2016
+++ src/sys/netinet/in_var.h	Fri Jul  8 03:40:34 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: in_var.h,v 1.76 2016/07/06 08:42:34 ozaki-r Exp $	*/
+/*	$NetBSD: in_var.h,v 1.77 2016/07/08 03:40:34 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -167,6 +167,8 @@ extern struct pslist_head in_ifaddrhead_
 	PSLIST_ENTRY_INIT((__ia), ia_hash_pslist_entry);
 #define IN_ADDRHASH_ENTRY_DESTROY(__ia)					\
 	PSLIST_ENTRY_DESTROY((__ia), ia_hash_pslist_entry);
+#define IN_ADDRHASH_READER_NEXT(__ia)					\
+	PSLIST_READER_NEXT((__ia), struct in_ifaddr, ia_hash_pslist_entry)
 
 #define IN_ADDRLIST_ENTRY_INIT(__ia)					\
 	PSLIST_ENTRY_INIT((__ia), ia_pslist_entry)
@@ -227,7 +229,7 @@ extern	const	int	inetctlerrmap[];
 	/* struct in_addr addr; */ \
 	/* struct in_ifaddr *ia; */ \
 { \
-	LIST_FOREACH(ia, &IN_IFADDR_HASH((addr).s_addr), ia_hash) { \
+	IN_ADDRHASH_READER_FOREACH(ia, addr.s_addr) { \
 		if (in_hosteq(ia->ia_addr.sin_addr, (addr))) \
 			break; \
 	} \
@@ -245,7 +247,7 @@ extern	const	int	inetctlerrmap[];
 	struct in_addr addr; \
 	addr = ia->ia_addr.sin_addr; \
 	do { \
-		ia = LIST_NEXT(ia, ia_hash); \
+		ia = IN_ADDRHASH_READER_NEXT(ia); \
 	} while ((ia != NULL) && !in_hosteq(ia->ia_addr.sin_addr, addr)); \
 }
 
@@ -273,7 +275,7 @@ extern	const	int	inetctlerrmap[];
 { \
 	struct ifaddr *ifa; \
 \
-	IFADDR_FOREACH(ifa, ifp) { \
+	IFADDR_READER_FOREACH(ifa, ifp) { \
 		if (ifa->ifa_addr->sa_family == AF_INET) \
 			break; \
 	} \

Index: src/sys/netinet6/in6_var.h
diff -u src/sys/netinet6/in6_var.h:1.81 src/sys/netinet6/in6_var.h:1.82
--- src/sys/netinet6/in6_var.h:1.81	Wed Jul  6 10:49:49 2016
+++ src/sys/netinet6/in6_var.h	Fri Jul  8 03:40:34 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: in6_var.h,v 1.81 2016/07/06 10:49:49 ozaki-r Exp $	*/
+/*	$NetBSD: in6_var.h,v 1.82 2016/07/08 03:40:34 ozaki-r Exp $	*/
 /*	$KAME: in6_var.h,v 1.81 2002/06/08 11:16:51 itojun Exp $	*/
 
 /*
@@ -566,7 +566,7 @@ ifp_to_ia6(struct ifnet *ifp)
 {
 	struct ifaddr *ifa;
 
-	IFADDR_FOREACH(ifa, ifp) {
+	IFADDR_READER_FOREACH(ifa, ifp) {
 		if (ifa->ifa_addr->sa_family == AF_INET6)
 			break;
 	}