From Stephen Donnelly: updates to the DAG support, to support their

[libpcap] / pcap-int.h

diff --git a/pcap-int.h b/pcap-int.h
index 5cfa7cec26e6d1c77e85a0d9e89fbc2d345738c4..e62d74f15b637720df21d7d87620431345a31b6f 100644 (file)
--- a/pcap-int.h
+++ b/pcap-int.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#) $Header: /tcpdump/master/libpcap/pcap-int.h,v 1.68.2.5 2005-07-07 02:04:33 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/pcap-int.h,v 1.68.2.6 2005-07-07 06:56:04 guy Exp $ (LBL)
  */
 
 #ifndef pcap_int_h
@@ -91,12 +91,21 @@ struct pcap_md {
 #endif
 
 #ifdef HAVE_DAG_API
+#ifdef HAVE_DAG_STREAMS_API
+       u_char  *dag_mem_bottom;        /* DAG card current memory bottom pointer */
+       u_char  *dag_mem_top;   /* DAG card current memory top pointer */
+#else
        void    *dag_mem_base;  /* DAG card memory base address */
-       u_int   dag_mem_bottom; /* DAG card current memory bottom pointer */
-       u_int   dag_mem_top;    /* DAG card current memory top pointer */
+       u_int   dag_mem_bottom; /* DAG card current memory bottom offset */
+       u_int   dag_mem_top;    /* DAG card current memory top offset */
+#endif /* HAVE_DAG_STREAMS_API */
        int     dag_fcs_bits;   /* Number of checksum bits from link layer */
        int     dag_offset_flags; /* Flags to pass to dag_offset(). */
-#endif
+       int     dag_stream;     /* DAG stream number */
+       int     dag_timeout;    /* timeout specified to pcap_open_live.
+                                * Same as in linux above, introduce
+                                * generally? */
+#endif /* HAVE_DAG_API */
 };
 
 /*