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 347ba3e772950891612c44e6ac6930110d22decb..b55d1968c923236d061e231f0d87b6e685104f60 100644 (file)
--- a/bsd/netat/ddp_proto.c
+++ b/bsd/netat/ddp_proto.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) 1988, 1989, 1997, 1998 Apple Computer, Inc. 
@@ -47,10 +53,10 @@
 
 #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;
 
@@ -58,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;
@@ -79,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) {