xnu-1504.3.12.tar.gz

[apple/xnu.git] / bsd / net / if_gif.h

diff --git a/bsd/net/if_gif.h b/bsd/net/if_gif.h
index a41683a5e89a1ccb0726da553f21c04401d1bfb1..dc193f74cf07d5ad4fb6cd93f47cd2d43e6d2e65 100644 (file)
--- a/bsd/net/if_gif.h
+++ b/bsd/net/if_gif.h
@@ -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@
  */
 /*     $KAME: if_gif.h,v 1.7 2000/02/22 14:01:46 itojun Exp $  */
 
@@ -64,15 +67,15 @@
 #include <netinet/in.h>
 /* xxx sigh, why route have struct route instead of pointer? */
 
+#ifdef KERNEL_PRIVATE
 struct encaptab;
 
-#ifdef __APPLE_API_PRIVATE
 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__
-       struct if_proto *gif_proto; /* dlil protocol attached */
+       protocol_family_t gif_proto; /* dlil protocol attached */
 #endif
        union {
                struct route  gifscr_ro;    /* xxx */
@@ -81,27 +84,23 @@ struct gif_softc {
 #endif
        } gifsc_gifscr;
        int             gif_flags;
+       int             gif_called;
        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;
 };
 
 #define gif_ro gifsc_gifscr.gifscr_ro
 #if INET6
 #define gif_ro6 gifsc_gifscr.gifscr_ro6
 #endif
-#endif /* __APPLE_API_PRIVATE */
+
+#endif /* KERNEL_PRIVATE */
 
 #define GIF_MTU                (1280)  /* Default MTU */
 #define        GIF_MTU_MIN     (1280)  /* Minimum MTU */
 #define        GIF_MTU_MAX     (8192)  /* Maximum MTU */
 
-#ifdef __APPLE_API_PRIVATE
-/* Prototypes */
-int gif_input __P((struct mbuf *, char*, struct ifnet *, u_long, int));
-int gif_output __P((struct ifnet *, struct mbuf *,
-                   struct sockaddr *, struct rtentry *));
-int gif_ioctl __P((struct ifnet *, u_long, void*));
-#endif /* __APPLE_API_PRIVATE */
-
 #endif /* _NET_IF_GIF_H_ */