xnu-1228.5.18.tar.gz

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

diff --git a/bsd/netat/aurp_tickle.c b/bsd/netat/aurp_tickle.c
index 10d9debf02b1e253e3aa99bfd3a29a3e4fa895b1..9b68f9447ec43e468e3b7fc274c8fdf2a038fb50 100644 (file)
--- a/bsd/netat/aurp_tickle.c
+++ b/bsd/netat/aurp_tickle.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: tickle.c
  */
+ 
+#ifdef AURP_SUPPORT
+
 #include <sys/errno.h>
 #include <sys/types.h>
 #include <sys/param.h>
@@ -46,9 +52,9 @@
 
 #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>
 
@@ -59,12 +65,11 @@ void AURPsndTickle(state)
        int msize;
        gbuf_t *m;
        aurp_hdr_t *hdrp;
-       boolean_t       funnel_state;
 
-       funnel_state = thread_funnel_set(network_flock, TRUE);
+       atalk_lock();
 
        if (state->rcv_state == AURPSTATE_Unconnected) {
-                (void) thread_funnel_set(network_flock, FALSE);
+               atalk_unlock();
                return;
         }
        /* stop trying if the retry count exceeds the maximum retry value */
@@ -81,7 +86,7 @@ void AURPsndTickle(state)
 
                /* purge all routes associated with the tunnel peer */
                AURPpurgeri(state->rem_node);
-                (void) thread_funnel_set(network_flock, FALSE);
+               atalk_unlock();
                return;
        }
 
@@ -105,7 +110,7 @@ void AURPsndTickle(state)
        /* start the retry timer */
        timeout(AURPsndTickle, state, AURP_TickleRetryInterval*HZ);
 
-       (void) thread_funnel_set(network_flock, FALSE);
+       atalk_unlock();
 }
 
 /* */
@@ -160,3 +165,5 @@ void AURPrcvTickleAck(state, m)
        /* update state info */
        state->tickle_retry = 0;
 }
+
+#endif  /* AURP_SUPPORT */