xnu-344.49.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 2d7e98c73ba4ec35ed3583e1c3821ee245f4ce73..f1452676de17613fcd26b3ecb06ac2477b1318a9 100644 (file)
--- a/bsd/netat/ddp_nbp.c
+++ b/bsd/netat/ddp_nbp.c
@@ -3,19 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -1512,17 +1515,17 @@ int nbp_mh_reg(nbpP)
                /* multihoming mode with a specific zone specified */
                /* see which segments (interfaces) are seeded for this zone */
                int zno;
                /* 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);
                }
                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) {
                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
                                        /* zone doesn't match */
                                continue;
                        else


@@ -1551,10 +1554,11 @@ int nbp_mh_reg(nbpP)
                                continue;
                        if (nbp_new_nve_entry(&nve, ifID) == 0)
                                registered++;
                                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;
                }
        }
        nbpP->unique_nbp_id = (registered > 1)? 0: nve.unique_nbp_id;