xnu-1228.7.58.tar.gz

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

diff --git a/bsd/net/bpfdesc.h b/bsd/net/bpfdesc.h
index b8f80bb63003e3b7f25d6aa1afa8d597747cd48f..9f514f89c94a783f2aff7c3fd0fd3b733d15d88a 100644 (file)
--- a/bsd/net/bpfdesc.h
+++ b/bsd/net/bpfdesc.h
@@ -1,23 +1,29 @@
 /*
 /*

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

  *
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_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 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.

  * 
  * 

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

  */
 /*
  * Copyright (c) 1990, 1991, 1993
  */
 /*
  * Copyright (c) 1990, 1991, 1993


@@ -64,7 +70,7 @@
 #ifndef _NET_BPFDESC_H_
 #define _NET_BPFDESC_H_
 #include <sys/appleapiopts.h>
 #ifndef _NET_BPFDESC_H_
 #define _NET_BPFDESC_H_
 #include <sys/appleapiopts.h>

-#ifdef __APPLE_API_PRIVATE
+#ifdef KERNEL_PRIVATE

 /*
  * The items in this header file should be wrapped in #ifdef KERNEL.
  */
 /*
  * The items in this header file should be wrapped in #ifdef KERNEL.
  */


@@ -120,7 +126,9 @@ struct bpf_d {
 #endif
        int             bd_hdrcmplt;    /* false to fill in src lladdr automatically */
        int             bd_seesent;     /* true if bpf should see sent packets */
 #endif
        int             bd_hdrcmplt;    /* false to fill in src lladdr automatically */
        int             bd_seesent;     /* true if bpf should see sent packets */

-
+#if CONFIG_MACF_NET
+       struct label *  bd_label;       /* MAC label for descriptor */
+#endif

 };
 
 /*
 };
 
 /*


@@ -132,7 +140,9 @@ struct bpf_if {
        u_int bif_dlt;                  /* link layer type */
        u_int bif_hdrlen;               /* length of header (with padding) */
        struct ifnet *bif_ifp;          /* corresponding interface */
        u_int bif_dlt;                  /* link layer type */
        u_int bif_hdrlen;               /* length of header (with padding) */
        struct ifnet *bif_ifp;          /* corresponding interface */

+       bpf_send_func   bif_send;
+       bpf_tap_func    bif_tap;

 };
 
 };
 

-#endif /* __APPLE_API_PRIVATE */
+#endif /* KERNEL_PRIVATE */

 #endif
 #endif