xnu-517.3.15.tar.gz

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

diff --git a/bsd/netat/aurp_aurpd.c b/bsd/netat/aurp_aurpd.c
index eca9c375797e513915532fc343d9799a3adb54a8..8d9989e0070070633bfea5f398660f80b691f138 100644 (file)
--- a/bsd/netat/aurp_aurpd.c
+++ b/bsd/netat/aurp_aurpd.c
@@ -3,19 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.

  * 
  * 

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


@@ -259,7 +262,7 @@ AURPgetmsg(err)
                                ("AURPgetmsg: soreceive returned %d, aurp_global.event==0x%x\n", *err, events));
                        /* soreceive() sets *mp to zero! at start */
                        if (p_mbuf)
                                ("AURPgetmsg: soreceive returned %d, aurp_global.event==0x%x\n", *err, events));
                        /* soreceive() sets *mp to zero! at start */
                        if (p_mbuf)

-                               ip_to_atalk(from, p_mbuf);
+                               ip_to_atalk((struct sockaddr_in *)from, p_mbuf);

                        if (*err || (p_mbuf == NULL)) {
                                /*
                                 * An error occurred in soreceive(),
                        if (*err || (p_mbuf == NULL)) {
                                /*
                                 * An error occurred in soreceive(),


@@ -310,7 +313,7 @@ void aurp_wakeup(struct socket *so, register caddr_t p, int state)
                ("aurp_wakeup: bit 0x%x, aurp_global.event now 0x%x\n",
                bit, aurp_global.event));
 
                ("aurp_wakeup: bit 0x%x, aurp_global.event now 0x%x\n",
                bit, aurp_global.event));
 

-       thread_wakeup(&aurp_global.event_anchor);
+       wakeup(&aurp_global.event_anchor);

 }
 
 /*
 }
 
 /*