xnu-1228.5.18.tar.gz

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

diff --git a/bsd/netat/aurp_open.c b/bsd/netat/aurp_open.c
index 4bda301fdf7c009275469cd8e8a929d01f088359..d3bec04417688dbc1138c33371aa03f96c53d4be 100644 (file)
--- a/bsd/netat/aurp_open.c
+++ b/bsd/netat/aurp_open.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) 1996 Apple Computer, Inc. 
@@ -30,6 +33,9 @@
  *
  *     File: open.c
  */
+ 
+#ifdef AURP_SUPPORT
+
 #include <sys/errno.h>
 #include <sys/types.h>
 #include <sys/param.h>
@@ -46,20 +52,20 @@
 
 #include <netat/sysglue.h>
 #include <netat/appletalk.h>
+#include <netat/at_pcb.h>
 #include <netat/at_var.h>
 #include <netat/routing_tables.h>
-#include <netat/at_pcb.h>
 #include <netat/aurp.h>
 #include <netat/debug.h>
 
 
-/* funnel version of AURPsndOpenReq */
-void AURPsndOpenReq_funnel(state)
+/* locked version of AURPsndOpenReq */
+void AURPsndOpenReq_locked(state)
        aurp_state_t *state;
 {
-        thread_funnel_set(network_flock, TRUE);
+       atalk_lock();
        AURPsndOpenReq(state);
-        thread_funnel_set(network_flock, FALSE);
+       atalk_unlock();
 }
 
 /* */
@@ -119,7 +125,7 @@ void AURPsndOpenReq(state)
        }
 
        /* start the retry timer */
-       timeout(AURPsndOpenReq_funnel, state, AURP_RetryInterval*HZ);
+       timeout(AURPsndOpenReq_locked, state, AURP_RetryInterval*HZ);
        state->rcv_tmo = 1;
 }
 
@@ -221,7 +227,7 @@ void AURPrcvOpenRsp(state, m)
        }
 
        /* cancel the retry timer */
-       untimeout(AURPsndOpenReq_funnel, state);
+       untimeout(AURPsndOpenReq_locked, state);
        state->rcv_tmo = 0;
        state->rcv_retry = 0;
 
@@ -249,3 +255,5 @@ void AURPrcvOpenRsp(state, m)
        /* get routing info */
        AURPsndRIReq(state);
 }
+
+#endif  /* AURP_SUPPORT */