X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8f6c56a50524aa785f7e596d52dddfb331e18961..eee3565979933af707c711411001ba11fe406a3c:/bsd/net/if_gif.h

diff --git a/bsd/net/if_gif.h b/bsd/net/if_gif.h
index d0b9cf9b0..7fe954f2f 100644
--- a/bsd/net/if_gif.h
+++ b/bsd/net/if_gif.h
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2013 Apple 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
@@ -11,10 +11,10 @@
  * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -22,7 +22,7 @@
  * 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_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*	$KAME: if_gif.h,v 1.7 2000/02/22 14:01:46 itojun Exp $	*/
@@ -61,21 +61,24 @@
  */
 
 #ifndef _NET_IF_GIF_H_
-#define _NET_IF_GIF_H_
+#define	_NET_IF_GIF_H_
 #include <sys/appleapiopts.h>
 
 #include <netinet/in.h>
 /* xxx sigh, why route have struct route instead of pointer? */
 
-#ifdef KERNEL_PRIVATE
+#ifdef BSD_KERNEL_PRIVATE
+
+extern void gif_init(void);
+
 struct encaptab;
 
 struct gif_softc {
-	struct ifnet	gif_if;	   /* common area - must be at the top */
+	ifnet_t			gif_if;	   /* pointer back to the interface */
 	struct sockaddr	*gif_psrc; /* Physical src addr */
 	struct sockaddr	*gif_pdst; /* Physical dst addr */
 #ifdef __APPLE__
-	u_long	gif_proto; /* dlil protocol attached */
+	protocol_family_t gif_proto; /* dlil protocol attached */
 #endif
 	union {
 		struct route  gifscr_ro;    /* xxx */
@@ -88,26 +91,26 @@ struct gif_softc {
 	const struct encaptab *encap_cookie4;
 	const struct encaptab *encap_cookie6;
 	TAILQ_ENTRY(gif_softc) gif_link; /* all gif's are linked */
+	bpf_tap_mode	tap_mode;
+	bpf_packet_func tap_callback;
+	char 	gif_ifname[IFNAMSIZ];
+	decl_lck_mtx_data(, gif_lock);	/* lock for gif softc structure */
 };
 
-#define gif_ro gifsc_gifscr.gifscr_ro
+#define	GIF_LOCK(_sc)		lck_mtx_lock(&(_sc)->gif_lock)
+#define	GIF_UNLOCK(_sc)		lck_mtx_unlock(&(_sc)->gif_lock)
+#define	GIF_LOCK_ASSERT(_sc)	lck_mtx_assert(&(_sc)->gif_lock,	\
+    LCK_MTX_ASSERT_OWNED)
+
+#define	gif_ro gifsc_gifscr.gifscr_ro
 #if INET6
-#define gif_ro6 gifsc_gifscr.gifscr_ro6
+#define	gif_ro6 gifsc_gifscr.gifscr_ro6
 #endif
 
-#endif /* KERNEL_PRIVATE */
+#endif /* BSD_KERNEL_PRIVATE */
 
-#define GIF_MTU		(1280)	/* Default MTU */
+#define	GIF_MTU		(1280)	/* Default MTU */
 #define	GIF_MTU_MIN	(1280)	/* Minimum MTU */
 #define	GIF_MTU_MAX	(8192)	/* Maximum MTU */
 
-#ifdef KERNEL_PRIVATE
-
-/* Prototypes */
-int gif_input(struct mbuf *, char*, struct ifnet *, u_long, int);
-int gif_output(struct ifnet *, struct mbuf *,
-		    struct sockaddr *, struct rtentry *);
-int gif_ioctl(struct ifnet *, u_long, void*);
-
-#endif /* KERNEL_PRIVATE */
 #endif /* _NET_IF_GIF_H_ */