xnu-344.32.tar.gz

[apple/xnu.git] / bsd / netat / ddp_nbp.c

diff --git a/bsd/netat/ddp_nbp.c b/bsd/netat/ddp_nbp.c
index dd77e5fd5c690bb6fe3536696d212227e2a77e70..1bfec9e17282a4e240d9298d4bf644a19300dc31 100644 (file)
--- a/bsd/netat/ddp_nbp.c
+++ b/bsd/netat/ddp_nbp.c
@@ -69,7 +69,6 @@
 #endif
 
 #define        errno   nbperrno
-#define NBP_DEBUG  0
 
        /* externs */
 extern at_ifaddr_t *ifID_table[];
@@ -116,10 +115,13 @@ void sethzonehash(elapp)
 void nbp_shutdown()
 {
        /* delete all NVE's and release buffers */
-       register nve_entry_t    *nve_entry, *next_nve;
+       register nve_entry_t    *nve_entry, *nve_next;
 
        ATDISABLE(nve_lock_pri,NVE_LOCK);
-       TAILQ_FOREACH(nve_entry, &name_registry, nve_link) {
+        for ((nve_entry = TAILQ_FIRST(&name_registry)); nve_entry; nve_entry = nve_next) {
+                nve_next = TAILQ_NEXT(nve_entry, nve_link);
+
+                /* NB: nbp_delete_entry calls TAILQ_REMOVE */
                nbp_delete_entry(nve_entry);
        }
        ATENABLE(nve_lock_pri,NVE_LOCK);
@@ -1510,17 +1512,17 @@ int nbp_mh_reg(nbpP)
                /* multihoming mode with a specific zone specified */
                /* see which segments (interfaces) are seeded for this zone */
                int zno;
-               char ifs_in_zone[IF_TOTAL_MAX];
+               at_ifnames_t ifs_in_zone;
                if (!(zno = zt_find_zname(&nve.zone))) {
                        dPrintf(D_M_NBP_LOW, D_L_WARNING, 
                                ("nbp_mh_reg: didn't find zone name\n"));
                        return(EINVAL);
                }
-               getIfUsage(zno-1, ifs_in_zone);
+               getIfUsage(zno-1, &ifs_in_zone);
 
-               /* now find the first matching interface */
+               /* now find the matching interfaces */
                TAILQ_FOREACH(ifID, &at_ifQueueHd, aa_link) {
-                       if (!ifs_in_zone[ifID->ifPort]) 
+                       if (!ifs_in_zone.at_if[ifID->ifPort]) 
                                        /* zone doesn't match */
                                continue;
                        else
@@ -1549,10 +1551,11 @@ int nbp_mh_reg(nbpP)
                                continue;
                        if (nbp_new_nve_entry(&nve, ifID) == 0)
                                registered++;
-               }
-               if (registered && !nbpP->addr.net && !nbpP->addr.node) {
-                       nbpP->addr.net = ifID->ifThisNode.s_net;
-                       nbpP->addr.node = ifID->ifThisNode.s_node;
+                       if (registered && !nbpP->addr.net && !nbpP->addr.node) {
+                               nbpP->addr.net = ifID->ifThisNode.s_net;
+                               nbpP->addr.node = ifID->ifThisNode.s_node;
+                       }
+
                }
        }
        nbpP->unique_nbp_id = (registered > 1)? 0: nve.unique_nbp_id;