X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/d7e50217d7adf6e52786a38bcaa4cd698cb9a79e..5d5c5d0d5b79ade9a973d55186ffda2638ba2b6e:/bsd/netat/at_pcb.c

diff --git a/bsd/netat/at_pcb.c b/bsd/netat/at_pcb.c
index de172f33b..8b98ebbaf 100644
--- a/bsd/netat/at_pcb.c
+++ b/bsd/netat/at_pcb.c
@@ -1,26 +1,31 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * 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
+ * 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.  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
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
+ *
+ * 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, 
+ * 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_OSREFERENCE_HEADER_END@
  */
 
 /*
@@ -133,9 +138,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 +159,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 +191,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;