xnu-1228.15.4.tar.gz

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

diff --git a/bsd/netat/at_pcb.c b/bsd/netat/at_pcb.c
index de172f33b9166f6b46f67eaca984e8b5761a242f..a1e542bdf3c4c4729af21216ca23b013aa2fe106 100644 (file)
--- a/bsd/netat/at_pcb.c
+++ b/bsd/netat/at_pcb.c
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @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
@@ -20,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@
  */
 
 /*
@@ -94,7 +97,7 @@ extern struct atpcb *atp_inputQ[];
 extern CCB *adsp_inputQ[];
 extern at_ifaddr_t *ifID_home;
 extern struct {
-  void (*func)();
+  ddp_handler_func func;
   } ddp_handler[];
 
 int DDP_chksum_on = FALSE;
@@ -102,7 +105,7 @@ int DDP_slfsnd_on = FALSE;
 
 zone_t atpcb_zone;
 
-void at_memzone_init()
+void at_memzone_init(void)
 {
        vm_size_t str_size;
 
@@ -133,9 +136,11 @@ int at_pcballoc(so, head)
 
        pcb->atpcb_head = head;
        pcb->atpcb_socket = so;
+       atalk_lock();   /* makes sure the list is locked while inserting atpcb */
        if (head)
            insque((queue_t)pcb, (queue_t)head);
        so->so_pcb = (caddr_t)pcb;
+       atalk_unlock();
 
        return (0);
 }
@@ -152,9 +157,10 @@ int at_pcbdetach(pcb)
        }
 
        so->so_pcb = 0;
+       so->so_flags |= SOF_PCBCLEARING;
        if ((pcb->atpcb_next) && (pcb->atpcb_prev))
            remque((queue_t)pcb);
-       zfree(atpcb_zone, (vm_offset_t)pcb);
+       zfree(atpcb_zone, pcb);
        sofree(so);
        return(0);
 }
@@ -183,7 +189,6 @@ int at_pcbbind(pcb, nam)
        register struct atpcb *pcb;
        struct sockaddr *nam;
 {
-       register struct socket *so = pcb->atpcb_socket;
        register struct sockaddr_at *local = (struct sockaddr_at *) nam;
        u_char ddpsock = local->sat_port;