xnu-792.17.14.tar.gz

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

diff --git a/bsd/netat/ddp_usrreq.c b/bsd/netat/ddp_usrreq.c
index c3db5fba4dacf5bfb322db396b0b36e4e5fbed24..b4862ef987bb12597f69f869872534955aa544c0 100644 (file)
--- a/bsd/netat/ddp_usrreq.c
+++ b/bsd/netat/ddp_usrreq.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) 1998 Apple Computer, Inc. 
@@ -84,14 +90,17 @@ int ddp_pru_attach(struct socket *so, int proto,
        at_ddp_t *ddp = NULL;
        struct atpcb *pcb = (struct atpcb *)((so)->so_pcb);
 
+        error = soreserve(so, ddp_sendspace, ddp_recvspace);
+       if (error != 0)
+               return error;
+
        s = splnet();
        error = at_pcballoc(so, &ddp_head);
        splx(s);
        if (error)
                return error;
-       error = soreserve(so, ddp_sendspace, ddp_recvspace);
        pcb = (struct atpcb *)((so)->so_pcb);
-       pcb->pid = current_proc()->p_pid;
+       pcb->pid = proc_selfpid();
        pcb->ddptype = (u_char) proto;    /* set in socreate() */
        pcb->proto = ATPROTO_DDP;
 
@@ -184,7 +193,14 @@ int        ddp_pru_send(struct socket *so, int flags, struct mbuf *m,
 
        if (pcb == NULL)
                return (EINVAL);
-
+               
+       /*
+        * Set type to MSG_DATA.  Otherwise looped back packet is not
+        * recognized by atp_input() and possibly other protocols.
+        */
+        
+       MCHTYPE(m, MSG_DATA);
+       
        if (!(pcb->ddp_flags & DDPFLG_HDRINCL)) {
                /* prepend a DDP header */
                M_PREPEND(m, DDP_X_HDR_SIZE, M_WAIT);