xnu-344.21.73.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 8cc764bda7536408fdbfd2b130b7bcd3a51bdfb2..02a387be2f0c6d97a884a16515a269ac0feb15b9 100644 (file)
--- a/bsd/netat/aurp_aurpd.c
+++ b/bsd/netat/aurp_aurpd.c
@@ -3,19 +3,22 @@
  *
  * @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,
- * 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@
  */
@@ -139,6 +142,7 @@ aurpd_start()
                sopt.sopt_level   = SOL_SOCKET;
                sopt.sopt_name    = SO_RCVBUF;
                sopt.sopt_dir     = SOPT_SET;
+               sopt.sopt_p               = NULL;
                if ((error = sosetopt(so, &sopt)) != 0)
                        goto out;
        }
@@ -158,6 +162,7 @@ aurpd_start()
                sopt.sopt_level   = SOL_SOCKET;
                sopt.sopt_name    = SO_SNDBUF;
                sopt.sopt_dir     = SOPT_SET;
+               sopt.sopt_p               = NULL;
                if ((error = sosetopt(so, &sopt)) != 0)
                        goto out;
        }
@@ -165,10 +170,8 @@ aurpd_start()
        so->so_upcall = aurp_wakeup;
        so->so_upcallarg = (caddr_t)AE_UDPIP; /* Yuck */
        so->so_state |= SS_NBIO;
-       so->so_rcv.sb_flags |=SB_NOINTR;
-       so->so_rcv.sb_sel.si_flags |=SI_SBSEL;
-       so->so_snd.sb_flags |=SB_NOINTR;
-       so->so_snd.sb_sel.si_flags |=SI_SBSEL;
+       so->so_rcv.sb_flags |=(SB_SEL|SB_NOINTR);
+       so->so_snd.sb_flags |=(SB_SEL|SB_NOINTR);
 
 out:
        sbunlock(&so->so_snd);
@@ -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));
 
-       thread_wakeup(&aurp_global.event_anchor);
+       wakeup(&aurp_global.event_anchor);
 }
 
 /*