xnu-3248.20.55.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 bfd647244913e8e8f3620d9a6d4cf1232b35603d..7fe954f2f3e4662d9278c939fd594b3d460321f9 100644 (file)
--- a/bsd/net/if_gif.h
+++ b/bsd/net/if_gif.h
@@ -1,23 +1,29 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2013 Apple Inc. All rights reserved.

  *
  *

- * @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.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * @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. 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

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * 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.
- * 
- * @APPLE_LICENSE_HEADER_END@
+ * 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 $  */
 
  */
 /*     $KAME: if_gif.h,v 1.7 2000/02/22 14:01:46 itojun Exp $  */
 


@@ -55,21 +61,24 @@
  */
 
 #ifndef _NET_IF_GIF_H_
  */
 
 #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? */
 
 #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 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__
        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 */
 #endif
        union {
                struct route  gifscr_ro;    /* xxx */


@@ -82,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 */
        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
 #if INET6

-#define gif_ro6 gifsc_gifscr.gifscr_ro6
+#define        gif_ro6 gifsc_gifscr.gifscr_ro6

 #endif
 
 #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 */
 
 #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_ */
 #endif /* _NET_IF_GIF_H_ */