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 7c120650e15a710c7c92a25d33afbdb82427c4ca..a1e542bdf3c4c4729af21216ca23b013aa2fe106 100644 (file)
--- a/bsd/netat/at_pcb.c
+++ b/bsd/netat/at_pcb.c
@@ -1,23 +1,29 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_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.
+ * 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.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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_OSREFERENCE_LICENSE_HEADER_END@

  */
 
 /*
  */
 
 /*


@@ -91,7 +97,7 @@ extern struct atpcb *atp_inputQ[];
 extern CCB *adsp_inputQ[];
 extern at_ifaddr_t *ifID_home;
 extern struct {
 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;
   } ddp_handler[];
 
 int DDP_chksum_on = FALSE;


@@ -99,7 +105,7 @@ int DDP_slfsnd_on = FALSE;
 
 zone_t atpcb_zone;
 
 
 zone_t atpcb_zone;
 

-void at_memzone_init()
+void at_memzone_init(void)

 {
        vm_size_t str_size;
 
 {
        vm_size_t str_size;
 


@@ -130,9 +136,11 @@ int at_pcballoc(so, head)
 
        pcb->atpcb_head = head;
        pcb->atpcb_socket = so;
 
        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;
        if (head)
            insque((queue_t)pcb, (queue_t)head);
        so->so_pcb = (caddr_t)pcb;

+       atalk_unlock();

 
        return (0);
 }
 
        return (0);
 }


@@ -149,9 +157,10 @@ int at_pcbdetach(pcb)
        }
 
        so->so_pcb = 0;
        }
 
        so->so_pcb = 0;

+       so->so_flags |= SOF_PCBCLEARING;

        if ((pcb->atpcb_next) && (pcb->atpcb_prev))
            remque((queue_t)pcb);
        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);
 }
        sofree(so);
        return(0);
 }


@@ -180,7 +189,6 @@ int at_pcbbind(pcb, nam)
        register struct atpcb *pcb;
        struct sockaddr *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;
 
        register struct sockaddr_at *local = (struct sockaddr_at *) nam;
        u_char ddpsock = local->sat_port;