xnu-792.22.5.tar.gz

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

diff --git a/bsd/netat/ddp_rtmptable.c b/bsd/netat/ddp_rtmptable.c
index a8be83510e152f41c497ff95c5dac903e37e9639..9141b98db62b20841f93a2fb788bfd7539df81d6 100644 (file)
--- a/bsd/netat/ddp_rtmptable.c
+++ b/bsd/netat/ddp_rtmptable.c
@@ -1,14 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * 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.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * 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
@@ -18,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*----------------------------------------------------------------------------
  *
@@ -87,7 +92,6 @@ char errstr[512];             /* used to display meaningfull router errors*/
 extern at_ifaddr_t *ifID_table[];
 extern at_ifaddr_t *ifID_home;
 extern snmpStats_t     snmpStats;
-extern atlock_t        ddpinp_lock;
 
 short ErrorRTMPoverflow = 0;   /* flag if RTMP table is too small for this net */
 short ErrorZIPoverflow  = 0;   /* flag if ZIP table is too small for this net */
@@ -147,12 +151,10 @@ at_net_al NetNumber;
 
        RT_entry *ptree = &RT_table_start;
        at_net_al LowEnd;
-       register unsigned int s;
 /*
        dPrintf(D_M_RTMP_LOW, D_L_ROUTING, ("%s : Lookup for Net=%d\n",
                 "rt_blookup", NetNumber));
 */     
-       ATDISABLE(s, ddpinp_lock);
        while (ptree) {
 
                if (NetNumber > ptree->NetStop) {
@@ -177,7 +179,6 @@ at_net_al NetNumber;
                        ptree = ptree->left;
                        continue;
                   }
-                  ATENABLE(s, ddpinp_lock);
                   
                   /* we're in the range (either extended or not)
                    * return the entry found.
@@ -191,7 +192,6 @@ at_net_al NetNumber;
                   return (ptree);
                }       
        }
-       ATENABLE(s, ddpinp_lock);
 
        dPrintf(D_M_RTMP_LOW, D_L_ROUTING, ("%s : %04d : NOT FOUND\n",
                 "rt_blookup", NetNumber));
@@ -497,23 +497,19 @@ int zt_add_zonename(zname)
 at_nvestr_t *zname;
 {
        register short res,i;
-       register unsigned int s;
 
        if (res = zt_find_zname(zname))
                return(res);
 
-       ATDISABLE(s, ddpinp_lock);
        for (i = 0; i < ZT_maxentry ; i++) {
                if (ZT_table[i].ZoneCount == 0 && ZT_table[i].Zone.len == 0) {/* free entry */
                        ZT_table[i].Zone = *zname;
                        dPrintf(D_M_RTMP, D_L_VERBOSE, ("zt_add_zonename: zone #%d %s len=%d\n",
                                i, ZT_table[i].Zone.str, ZT_table[i].Zone.len));
                        at_state.flags |= AT_ST_ZT_CHANGED;
-                       ATENABLE(s, ddpinp_lock);
                        return(i+1);
                }
        }
-       ATENABLE(s, ddpinp_lock);
        /* table full... */
        return (ZT_MAXEDOUT);
 }
@@ -708,14 +704,10 @@ RT_entry *ent;
        register u_char *zmap;
        register u_short i,j;
        register int       zone_count = 0 ;
-       register unsigned int s;
 
-       ATDISABLE(s, ddpinp_lock);
 
-       if (!RT_ALL_ZONES_KNOWN(ent)) {
-                       ATENABLE(s, ddpinp_lock);
+       if (!RT_ALL_ZONES_KNOWN(ent))
                        return (0);
-       }
        zmap = ent->ZoneBitMap;
 
        for (i = 0 ; i < ZT_BYTES ; i++) {
@@ -728,7 +720,6 @@ RT_entry *ent;
                zmap++;
        }
 
-       ATENABLE(s, ddpinp_lock);
        return (zone_count);
 }
 
@@ -740,13 +731,11 @@ at_nvestr_t *zname;
 {
        register short i, j, found;
        register char c1, c2;
-       register unsigned int s;
 
 
        if (!zname->len)
                return(0);
 
-       ATDISABLE(s, ddpinp_lock);
        for (i = 0 ; i < ZT_maxentry ; i++) {
                        if (!ZT_table[i].ZoneCount || zname->len != ZT_table[i].Zone.len)
                                        continue;
@@ -770,13 +759,10 @@ at_nvestr_t *zname;
                                }
                        }
 
-                       if (found) {
-                               ATENABLE(s, ddpinp_lock);
+                       if (found)
                                return (i+1);
-                       }
        }
 
-       ATENABLE(s, ddpinp_lock);
        return(0);
 }
 
@@ -789,14 +775,11 @@ void zt_set_zmap(znum, zmap)
      char *zmap;
 {
        register u_short num = znum -1;
-       register unsigned int s;
 
-       ATDISABLE(s, ddpinp_lock);
        if (!(zmap[num >> 3] & 0x80 >> (num % 8))) {
                zmap[num >> 3] |= 0x80 >> (num % 8);
                ZT_table[num].ZoneCount++;
        }
-       ATENABLE(s, ddpinp_lock);
 }
 
 
@@ -808,14 +791,11 @@ void zt_clr_zmap(znum, zmap)
      char *zmap;
 {
        register u_short num = znum -1;
-       register unsigned int s;
 
-       ATDISABLE(s, ddpinp_lock);
        if (zmap[num >> 3] & 0x80 >> (num % 8)) {
                zmap[num >> 3] ^= 0x80 >> (num % 8);
                ZT_table[num].ZoneCount--;
        }
-       ATENABLE(s, ddpinp_lock);
 }
 
 
@@ -1130,7 +1110,7 @@ void getIfUsage(zone, ifs_in_zone)
        at_ifaddr_t     *ifID;
 
        if (!MULTIPORT_MODE) {
-               strncpy(ifs_in_zone->at_if[cnt], ifID_home->ifName, 
+               strlcpy(ifs_in_zone->at_if[cnt], ifID_home->ifName, 
                        IFNAMESIZ);
                return;
        }
@@ -1145,7 +1125,7 @@ void getIfUsage(zone, ifs_in_zone)
                if (route->ZoneBitMap[zmi] & zmb) {
                        dPrintf(D_M_NBP_LOW, D_L_USR3, ("zone in port %d \n",
                                route->NetPort));
-                       strncpy(ifs_in_zone->at_if[cnt], 
+                       strlcpy(ifs_in_zone->at_if[cnt], 
                                ifID_table[route->NetPort]->ifName, IFNAMESIZ);
                        cnt++;
                }