xnu-1228.15.4.tar.gz

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

diff --git a/bsd/netat/ddp_proto.c b/bsd/netat/ddp_proto.c
index 7504e4874b74cab91b1aaba51d10dd9a47db5074..b55d1968c923236d061e231f0d87b6e685104f60 100644 (file)
--- a/bsd/netat/ddp_proto.c
+++ b/bsd/netat/ddp_proto.c
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000 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@
  */
 /*
  *     Copyright (c) 1988, 1989, 1997, 1998 Apple Computer, Inc. 
@@ -45,16 +48,15 @@
 #include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <sys/buf.h>
 
 #include <net/if.h>
 
 #include <netat/sysglue.h>
 #include <netat/appletalk.h>
+#include <netat/at_pcb.h>
 #include <netat/at_var.h>
 #include <netat/ddp.h>
 #include <netat/zip.h>
-#include <netat/at_pcb.h>
 
 extern at_ifaddr_t *ifID_home;
 
@@ -62,7 +64,6 @@ void ddp_putmsg(gref, mp)
        gref_t *gref;
        gbuf_t *mp;
 {
-       u_char socket;
        register ioc_t  *iocbp;
        register int    error;
        at_ddp_t *ddp;
@@ -83,9 +84,10 @@ void ddp_putmsg(gref, mp)
                        }
                }
 
-               if (gref && (gref->lport == 0)) {
+               if ((gref == 0) || (gref->lport == 0)) {
                        gbuf_freel(mp);
-                       atalk_notify(gref, ENOTCONN);
+                       if (gref)
+                               atalk_notify(gref, ENOTCONN);
                        return;
                }
                if ((error = ddp_output(&mp, gref->lport, 0)) != 0) {