xnu-792.17.14.tar.gz

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

diff --git a/bsd/netat/ddp.c b/bsd/netat/ddp.c
index a05405e149ada00c8942bb4ee2634c1473aaeef7..187a056760f72c936d0e4e11d4f060120a6b9c52 100644 (file)
--- a/bsd/netat/ddp.c
+++ b/bsd/netat/ddp.c
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000 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,
- * 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@
  */
 /*
  *     Copyright (c) 1987, 1988, 1989 Apple Computer, Inc. 
@@ -381,10 +387,10 @@ void  ddp_rem_if(ifID)
 
        /* un-do processing done in SIOCSIFADDR */
        if (ifa->ifa_addr) {
-               int s = splnet();
-               TAILQ_REMOVE(&ifID->aa_ifp->if_addrhead, ifa, ifa_link);
+               ifnet_lock_exclusive(ifID->aa_ifp);
+               if_detach_ifa(ifID->aa_ifp, ifa);
                ifa->ifa_addr = NULL;
-               splx(s);
+               ifnet_lock_done(ifID->aa_ifp);
        }
        if (ifID->at_dl_tag) {
 /*             dlil_detach_protocol(ifID->at_dl_tag); */
@@ -448,17 +454,19 @@ void ddp_notify_nbp(socket, pid, ddptype)
      unsigned char ddptype; /* not used */
 {
        extern int nve_lock;
-       nve_entry_t *nve_entry;
+       nve_entry_t *nve_entry, *nve_next;
 
        if (at_state.flags & AT_ST_STARTED) {
                /* *** NBP_CLOSE_NOTE processing (from ddp_nbp.c) *** */
                ATDISABLE(nve_lock, NVE_LOCK);
-               TAILQ_FOREACH(nve_entry, &name_registry, nve_link) {
+                for ((nve_entry = TAILQ_FIRST(&name_registry)); nve_entry; nve_entry = nve_next) {
+                        nve_next = TAILQ_NEXT(nve_entry, nve_link);
                        if ((at_socket)socket == nve_entry->address.socket &&
                            /* *** check complete address and ddptype here *** */
                            pid == nve_entry->pid &&
                            ot_ddp_check_socket(nve_entry->address.socket,
                                                nve_entry->pid) < 2) {
+                                /* NB: nbp_delete_entry calls TAILQ_REMOVE */
                                nbp_delete_entry(nve_entry);
                        }
                }
@@ -540,6 +548,14 @@ int ddp_output(mp, src_socket, src_addr_included)
 
        m = *mp;
        ddp = (at_ddp_t *)gbuf_rptr(m);
+       
+       if (!ifID) {
+               /* Device/Interface not configured */
+               dPrintf(D_M_DDP, D_L_ERROR, ("Device/Interface not configured"));
+               error = ENXIO;
+               gbuf_freel(*mp);
+               goto exit_ddp_output;
+       }
 
        if ((ddp->dst_socket > (unsigned) (DDP_SOCKET_LAST + 1)) || 
            (ddp->dst_socket < DDP_SOCKET_1st_RESERVED)) {
@@ -1041,9 +1057,10 @@ void ddp_input(mp, ifID)
                   ATP / raw-DDP and ADSP / raw-DDP are possible */
                for (gref = ddp_head.atpcb_next; gref != &ddp_head; 
                       gref = gref->atpcb_next)
-                   if (gref->lport == socket) {
-                       dPrintf(D_M_DDP, D_L_INPUT, 
-                               ("ddp_input: streamq, skt %d\n", socket));
+                   if (gref->lport == socket &&
+                       (gref->ddptype == 0 || gref->ddptype == ddp->type)) {
+                                       dPrintf(D_M_DDP, D_L_INPUT, 
+                                       ("ddp_input: streamq, skt %d\n", socket));
                        if (gref->atpcb_socket) {
                                struct sockaddr_at ddp_in;
                                ddp_in.sat_len = sizeof(ddp_in);
@@ -1069,10 +1086,9 @@ void ddp_input(mp, ifID)
 
                                if (sbappendaddr(&((gref->atpcb_socket)->so_rcv), 
                                                 (struct sockaddr *)&ddp_in,
-                                                mp, 0) == 0)
-                                       gbuf_freem(mp);
-                               else
+                                                mp, 0, NULL) != 0) {
                                        sorwakeup(gref->atpcb_socket);
+                                }
                        } else {
                                atalk_putnext(gref, mp);
                        }