[src/trunk]: src/sys Add IFNET_FOREACH and IFADDR_FOREACH macros and start us...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/38e2287b634c
branches:  trunk
changeset: 573285:38e2287b634c
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Jan 24 21:25:09 2005 +0000

description:
Add IFNET_FOREACH and IFADDR_FOREACH macros and start using them.

diffstat:

 sys/compat/darwin/darwin_route.c |  10 +++++-----
 sys/dev/pci/if_bge.c             |   6 +++---
 sys/dev/qbus/if_dmc.c            |   6 +++---
 sys/kern/kern_subr.c             |   6 +++---
 sys/kern/kern_uuid.c             |   8 ++++----
 sys/kern/uipc_mbuf.c             |   3 ++-
 sys/net/if.c                     |   6 +++---
 sys/net/if.h                     |   8 +++++---
 sys/net/if_spppsubr.c            |  14 +++++++-------
 sys/net/if_stf.c                 |   6 +++---
 sys/net/if_tun.c                 |   8 ++++----
 sys/net/rtsock.c                 |   6 +++---
 sys/netinet/in.c                 |   8 ++++----
 sys/netinet/in_var.h             |   4 ++--
 sys/netinet/ip_icmp.c            |   8 ++++----
 sys/netinet/ip_input.c           |   6 +++---
 16 files changed, 58 insertions(+), 55 deletions(-)

diffs (truncated from 493 to 300 lines):

diff -r 76b382c0eea2 -r 38e2287b634c sys/compat/darwin/darwin_route.c
--- a/sys/compat/darwin/darwin_route.c  Mon Jan 24 19:08:23 2005 +0000
+++ b/sys/compat/darwin/darwin_route.c  Mon Jan 24 21:25:09 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: darwin_route.c,v 1.8 2004/11/07 04:08:37 david Exp $ */
+/*     $NetBSD: darwin_route.c,v 1.9 2005/01/24 21:25:09 matt Exp $ */
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: darwin_route.c,v 1.8 2004/11/07 04:08:37 david Exp $");
+__KERNEL_RCSID(0, "$NetBSD: darwin_route.c,v 1.9 2005/01/24 21:25:09 matt Exp $");
 
 #include <sys/errno.h>
 #include <sys/systm.h>
@@ -66,7 +66,7 @@
 
        af = darwin_to_native_af[af];
 
-       TAILQ_FOREACH(ifp, &ifnet, if_list) {
+       IFNET_FOREACH(ifp) {
                struct ifaddr *ifa;
                struct sockaddr_dl *laddr = NULL;
                struct sockaddr_storage dladdr;
@@ -75,7 +75,7 @@
                 * Find the link layer info as it is needed 
                 * for computing darwin_if_msghdr's dim_len
                 */
-               TAILQ_FOREACH(ifa, &ifp->if_addrlist, ifa_list) {
+               IFADDR_FOREACH(ifa, ifp) {
                        if ((ifa->ifa_addr) &&
                            (ifa->ifa_addr->sa_family == AF_LINK)) {
                                laddr = (struct sockaddr_dl *)ifa->ifa_addr;
@@ -144,7 +144,7 @@
                        dst += ALIGN(dladdr.ss_len);
                }
                
-               TAILQ_FOREACH(ifa, &ifp->if_addrlist, ifa_list) {
+               IFADDR_FOREACH(ifa, ifp) {
                        struct darwin_ifa_msghdr diam;
                        int iaf;
 
diff -r 76b382c0eea2 -r 38e2287b634c sys/dev/pci/if_bge.c
--- a/sys/dev/pci/if_bge.c      Mon Jan 24 19:08:23 2005 +0000
+++ b/sys/dev/pci/if_bge.c      Mon Jan 24 21:25:09 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bge.c,v 1.80 2005/01/08 16:00:03 fredb Exp $        */
+/*     $NetBSD: if_bge.c,v 1.81 2005/01/24 21:25:09 matt Exp $ */
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.80 2005/01/08 16:00:03 fredb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.81 2005/01/24 21:25:09 matt Exp $");
 
 #include "bpfilter.h"
 #include "vlan.h"
@@ -675,7 +675,7 @@
        /*
         * Now search all the interfaces for this name/number
         */
-       TAILQ_FOREACH(ifp, &ifnet, if_list) {
+       IFNET_FOREACH(ifp) {
                if (strncmp(ifp->if_xname, namebuf, namelen) != 0)
                      continue;
                /* We got a match: update if doing auto-threshold-tuning */
diff -r 76b382c0eea2 -r 38e2287b634c sys/dev/qbus/if_dmc.c
--- a/sys/dev/qbus/if_dmc.c     Mon Jan 24 19:08:23 2005 +0000
+++ b/sys/dev/qbus/if_dmc.c     Mon Jan 24 21:25:09 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_dmc.c,v 1.7 2003/08/07 16:31:14 agc Exp $   */
+/*     $NetBSD: if_dmc.c,v 1.8 2005/01/24 21:25:09 matt Exp $  */
 /*
  * Copyright (c) 1982, 1986 Regents of the University of California.
  * All rights reserved.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_dmc.c,v 1.7 2003/08/07 16:31:14 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_dmc.c,v 1.8 2005/01/24 21:25:09 matt Exp $");
 
 #undef DMCDEBUG        /* for base table dump on fatal error */
 
@@ -313,7 +313,7 @@
         * Check to see that an address has been set
         * (both local and destination for an address family).
         */
-       TAILQ_FOREACH(ifa, &ifp->if_addrlist, ifa_list)
+       IFADDR_FOREACH(ifa, ifp)
                if (ifa->ifa_addr->sa_family && ifa->ifa_dstaddr->sa_family)
                        break;
        if (ifa == (struct ifaddr *) 0)
diff -r 76b382c0eea2 -r 38e2287b634c sys/kern/kern_subr.c
--- a/sys/kern/kern_subr.c      Mon Jan 24 19:08:23 2005 +0000
+++ b/sys/kern/kern_subr.c      Mon Jan 24 21:25:09 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_subr.c,v 1.114 2004/10/24 17:06:24 cube Exp $     */
+/*     $NetBSD: kern_subr.c,v 1.115 2005/01/24 21:25:09 matt Exp $     */
 
 /*-
  * Copyright (c) 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
@@ -86,7 +86,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.114 2004/10/24 17:06:24 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.115 2005/01/24 21:25:09 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_md.h"
@@ -821,7 +821,7 @@
        if (vops != NULL && vops->vfs_mountroot == mountroot &&
            rootspec == NULL &&
            (bootdv == NULL || bootdv->dv_class != DV_IFNET)) {
-               TAILQ_FOREACH(ifp, &ifnet, if_list) {
+               IFNET_FOREACH(ifp) {
                        if ((ifp->if_flags &
                             (IFF_LOOPBACK|IFF_POINTOPOINT)) == 0)
                                break;
diff -r 76b382c0eea2 -r 38e2287b634c sys/kern/kern_uuid.c
--- a/sys/kern/kern_uuid.c      Mon Jan 24 19:08:23 2005 +0000
+++ b/sys/kern/kern_uuid.c      Mon Jan 24 21:25:09 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_uuid.c,v 1.3 2004/09/12 23:17:37 thorpej Exp $    */
+/*     $NetBSD: kern_uuid.c,v 1.4 2005/01/24 21:25:09 matt Exp $       */
 
 /*
  * Copyright (c) 2002 Marcel Moolenaar
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_uuid.c,v 1.3 2004/09/12 23:17:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_uuid.c,v 1.4 2005/01/24 21:25:09 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
@@ -104,9 +104,9 @@
        int i, s;
 
        s = splnet();
-       TAILQ_FOREACH(ifp, &ifnet, if_list) {
+       IFNET_FOREACH(ifp) {
                /* Walk the address list */
-               TAILQ_FOREACH(ifa, &ifp->if_addrlist, ifa_list) {
+               IFADDR_FOREACH(ifa, ifp) {
                        sdl = (struct sockaddr_dl*)ifa->ifa_addr;
                        if (sdl != NULL && sdl->sdl_family == AF_LINK &&
                            sdl->sdl_type == IFT_ETHER) {
diff -r 76b382c0eea2 -r 38e2287b634c sys/kern/uipc_mbuf.c
--- a/sys/kern/uipc_mbuf.c      Mon Jan 24 19:08:23 2005 +0000
+++ b/sys/kern/uipc_mbuf.c      Mon Jan 24 21:25:09 2005 +0000
@@ -384,9 +384,10 @@
                        if (pr->pr_drain)
                                (*pr->pr_drain)();
        }
-       TAILQ_FOREACH(ifp, &ifnet, if_list)
+       IFNET_FOREACH(ifp) {
                if (ifp->if_drain)
                        (*ifp->if_drain)(ifp);
+       }
        splx(s);
        mbstat.m_drain++;
 }
diff -r 76b382c0eea2 -r 38e2287b634c sys/net/if.c
--- a/sys/net/if.c      Mon Jan 24 19:08:23 2005 +0000
+++ b/sys/net/if.c      Mon Jan 24 21:25:09 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if.c,v 1.152 2005/01/23 18:41:56 matt Exp $    */
+/*     $NetBSD: if.c,v 1.153 2005/01/24 21:25:09 matt Exp $    */
 
 /*-
  * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.152 2005/01/23 18:41:56 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.153 2005/01/24 21:25:09 matt Exp $");
 
 #include "opt_inet.h"
 
@@ -1662,7 +1662,7 @@
        } else {
                sign = 1;
        }
-       TAILQ_FOREACH(ifp, &ifnet, if_list) {
+       IFNET_FOREACH(ifp) {
                bcopy(ifp->if_xname, ifr.ifr_name, IFNAMSIZ);
                if ((ifa = TAILQ_FIRST(&ifp->if_addrlist)) == 0) {
                        memset(&ifr.ifr_addr, 0, sizeof(ifr.ifr_addr));
diff -r 76b382c0eea2 -r 38e2287b634c sys/net/if.h
--- a/sys/net/if.h      Mon Jan 24 19:08:23 2005 +0000
+++ b/sys/net/if.h      Mon Jan 24 21:25:09 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if.h,v 1.99 2005/01/08 03:18:18 yamt Exp $     */
+/*     $NetBSD: if.h,v 1.100 2005/01/24 21:25:09 matt Exp $    */
 
 /*-
  * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -725,11 +725,13 @@
 #define        IFQ_INC_DROPS(ifq)              ((ifq)->ifq_drops++)
 #define        IFQ_SET_MAXLEN(ifq, len)        ((ifq)->ifq_maxlen = (len))
 
-#ifdef _KERNEL
 #include <sys/mallocvar.h>
 MALLOC_DECLARE(M_IFADDR);
 MALLOC_DECLARE(M_IFMADDR);
-#endif
+
+#define        IFNET_FOREACH(ifp)              TAILQ_FOREACH(ifp, &ifnet, if_list)
+#define        IFADDR_FOREACH(ifa, ifp)        TAILQ_FOREACH(ifa, \
+                                           &(ifp)->if_addrlist, ifa_list)
 
 extern struct ifnet_head ifnet;
 extern struct ifnet **ifindex2ifnet;
diff -r 76b382c0eea2 -r 38e2287b634c sys/net/if_spppsubr.c
--- a/sys/net/if_spppsubr.c     Mon Jan 24 19:08:23 2005 +0000
+++ b/sys/net/if_spppsubr.c     Mon Jan 24 21:25:09 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_spppsubr.c,v 1.80 2004/12/22 05:11:24 itojun Exp $   */
+/*     $NetBSD: if_spppsubr.c,v 1.81 2005/01/24 21:25:09 matt Exp $     */
 
 /*
  * Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.80 2004/12/22 05:11:24 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.81 2005/01/24 21:25:09 matt Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipx.h"
@@ -4749,7 +4749,7 @@
         * aliases don't make any sense on a p2p link anyway.
         */
        si = 0;
-       TAILQ_FOREACH(ifa, &ifp->if_addrlist, ifa_list) {
+       IFADDR_FOREACH(ifa, ifp) {
                if (ifa->ifa_addr->sa_family == AF_INET) {
                        si = (struct sockaddr_in *)ifa->ifa_addr;
                        sm = (struct sockaddr_in *)ifa->ifa_netmask;
@@ -4789,7 +4789,7 @@
         * aliases don't make any sense on a p2p link anyway.
         */
 
-       TAILQ_FOREACH(ifa, &ifp->if_addrlist, ifa_list) {
+       IFADDR_FOREACH(ifa, ifp) {
                if (ifa->ifa_addr->sa_family == AF_INET) {
                        si = (struct sockaddr_in *)ifa->ifa_addr;
                        dest = (struct sockaddr_in *)ifa->ifa_dstaddr;
@@ -4855,7 +4855,7 @@
         * aliases don't make any sense on a p2p link anyway.
         */
 
-       TAILQ_FOREACH(ifa, &ifp->if_addrlist, ifa_list) {
+       IFADDR_FOREACH(ifa, ifp) {
                if (ifa->ifa_addr->sa_family == AF_INET) {
                        si = (struct sockaddr_in *)ifa->ifa_addr;
                        dest = (struct sockaddr_in *)ifa->ifa_dstaddr;
@@ -4904,7 +4904,7 @@
         * aliases don't make any sense on a p2p link anyway.
         */
        si = 0;
-       TAILQ_FOREACH(ifa, &ifp->if_addrlist, ifa_list)
+       IFADDR_FOREACH(ifa, ifp)
                if (ifa->ifa_addr->sa_family == AF_INET6) {
                        si = (struct sockaddr_in6 *)ifa->ifa_addr;
                        sm = (struct sockaddr_in6 *)ifa->ifa_netmask;
@@ -4957,7 +4957,7 @@
         */
 
        sin6 = NULL;
-       TAILQ_FOREACH(ifa, &ifp->if_addrlist, ifa_list)
+       IFADDR_FOREACH(ifa, ifp)
        {
                if (ifa->ifa_addr->sa_family == AF_INET6)
                {
diff -r 76b382c0eea2 -r 38e2287b634c sys/net/if_stf.c
--- a/sys/net/if_stf.c  Mon Jan 24 19:08:23 2005 +0000
+++ b/sys/net/if_stf.c  Mon Jan 24 21:25:09 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_stf.c,v 1.41 2004/12/04 18:31:43 peter Exp $        */
+/*     $NetBSD: if_stf.c,v 1.42 2005/01/24 21:25:09 matt Exp $ */
 /*     $KAME: if_stf.c,v 1.62 2001/06/07 22:32:16 itojun Exp $ */
 
 /*
@@ -75,7 +75,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_stf.c,v 1.41 2004/12/04 18:31:43 peter Exp $");