xnu-1699.24.23.tar.gz

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

diff --git a/bsd/net/bpfdesc.h b/bsd/net/bpfdesc.h
index 9f514f89c94a783f2aff7c3fd0fd3b733d15d88a..e0507f9354efa4c1689f965d0cfc214966bbb372 100644 (file)
--- a/bsd/net/bpfdesc.h
+++ b/bsd/net/bpfdesc.h
@@ -76,6 +76,7 @@
  */
 
 #include <sys/select.h>
  */
 
 #include <sys/select.h>

+#include <kern/thread_call.h>

 
 /*
  * Descriptor associated with each open bpf file.
 
 /*
  * Descriptor associated with each open bpf file.


@@ -99,11 +100,11 @@ struct bpf_d {
 
        int             bd_bufsize;     /* absolute length of buffers */
 
 
        int             bd_bufsize;     /* absolute length of buffers */
 

-       struct bpf_if * bd_bif;         /* interface descriptor */
-       u_long          bd_rtout;       /* Read timeout in 'ticks' */
+       struct bpf_if  *bd_bif;         /* interface descriptor */
+       u_int32_t               bd_rtout;       /* Read timeout in 'ticks' */

        struct bpf_insn *bd_filter;     /* filter code */
        struct bpf_insn *bd_filter;     /* filter code */

-       u_long          bd_rcount;      /* number of packets received */
-       u_long          bd_dcount;      /* number of packets dropped */
+       u_int32_t               bd_rcount;      /* number of packets received */
+       u_int32_t               bd_dcount;      /* number of packets dropped */

 
        u_char          bd_promisc;     /* true if listening promiscuously */
        u_char          bd_state;       /* idle, waiting, or timed out */
 
        u_char          bd_promisc;     /* true if listening promiscuously */
        u_char          bd_state;       /* idle, waiting, or timed out */


@@ -126,11 +127,25 @@ 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 */

+       int             bd_oflags;      /* device open flags */
+       thread_call_t bd_thread_call; /* for BPF timeouts with select */

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

+/* Values for bd_state */
+#define BPF_IDLE               0    /* no select in progress or kqueue pending */
+#define BPF_WAITING            1    /* waiting for read timeout in select/kqueue */
+#define BPF_TIMED_OUT  2        /* read timeout has expired in select/kqueue */
+#define BPF_DRAINING   3        /* waiting for timeout routine to finish during close */
+
+/* Test whether a BPF is ready for read(). */
+#define bpf_ready(bd)  ((bd)->bd_hlen != 0 ||          \
+                        (((bd)->bd_immediate || (bd)->bd_state == BPF_TIMED_OUT) && \
+                         (bd)->bd_slen != 0))
+
+

 /*
  * Descriptor associated with each attached hardware interface.
  */
 /*
  * Descriptor associated with each attached hardware interface.
  */