Update config.{guess,sub}, timestamps 2023-01-01,2023-01-21

[libpcap] / pcap-dag.c

diff --git a/pcap-dag.c b/pcap-dag.c
index ea1c09592c21fe275d58cff4adbffd6525552087..f261ead00df8a0c3bdcbe47206d03b180b883f94 100644 (file)
--- a/pcap-dag.c
+++ b/pcap-dag.c
@@ -1,22 +1,14 @@
 /*
 /*

- * pcap-dag.c: Packet capture interface for Emulex EndaceDAG cards.
- *
- * The functionality of this code attempts to mimic that of pcap-linux as much
- * as possible.  This code is compiled in several different ways depending on
- * whether DAG_ONLY and HAVE_DAG_API are defined.  If HAVE_DAG_API is not
- * defined it should not get compiled in, otherwise if DAG_ONLY is defined then
- * the 'dag_' function calls are renamed to 'pcap_' equivalents.  If DAG_ONLY
- * is not defined then nothing is altered - the dag_ functions will be
- * called as required from their pcap-linux/bpf equivalents.
+ * pcap-dag.c: Packet capture interface for Endace DAG cards.

  *
  * Authors: Richard Littin, Sean Irvine ({richard,sean}@reeltwo.com)
  * Modifications: Jesper Peterson
  *                Koryn Grant
  *
  * Authors: Richard Littin, Sean Irvine ({richard,sean}@reeltwo.com)
  * Modifications: Jesper Peterson
  *                Koryn Grant

- *                Stephen Donnelly <stephen.donnelly@emulex.com>
+ *                Stephen Donnelly <stephen.donnelly@endace.com>

  */
 
 #ifdef HAVE_CONFIG_H
  */
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #include <sys/param.h>                 /* optionally get BSD define */
 #endif
 
 #include <sys/param.h>                 /* optionally get BSD define */


@@ -27,7 +19,6 @@
 
 #include "pcap-int.h"
 
 
 #include "pcap-int.h"
 

-#include <ctype.h>

 #include <netinet/in.h>
 #include <sys/mman.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/mman.h>
 #include <sys/socket.h>


@@ -41,6 +32,7 @@ struct rtentry;               /* declarations in <net/if.h> */
 #include "dagnew.h"
 #include "dagapi.h"
 #include "dagpci.h"
 #include "dagnew.h"
 #include "dagapi.h"
 #include "dagpci.h"

+#include "dag_config_api.h"

 
 #include "pcap-dag.h"
 
 
 #include "pcap-dag.h"
 


@@ -54,96 +46,100 @@ struct rtentry;            /* declarations in <net/if.h> */
 #endif
 
 
 #endif
 
 

-#ifndef TYPE_AAL5
-#define TYPE_AAL5               4
+#ifndef ERF_TYPE_AAL5
+#define ERF_TYPE_AAL5               4
+#endif
+
+#ifndef ERF_TYPE_MC_HDLC
+#define ERF_TYPE_MC_HDLC            5

 #endif
 
 #endif
 

-#ifndef TYPE_MC_HDLC
-#define TYPE_MC_HDLC            5
+#ifndef ERF_TYPE_MC_RAW
+#define ERF_TYPE_MC_RAW             6

 #endif
 
 #endif
 

-#ifndef TYPE_MC_RAW
-#define TYPE_MC_RAW             6
+#ifndef ERF_TYPE_MC_ATM
+#define ERF_TYPE_MC_ATM             7

 #endif
 
 #endif
 

-#ifndef TYPE_MC_ATM
-#define TYPE_MC_ATM             7
+#ifndef ERF_TYPE_MC_RAW_CHANNEL
+#define ERF_TYPE_MC_RAW_CHANNEL     8

 #endif
 
 #endif
 

-#ifndef TYPE_MC_RAW_CHANNEL
-#define TYPE_MC_RAW_CHANNEL     8
+#ifndef ERF_TYPE_MC_AAL5
+#define ERF_TYPE_MC_AAL5            9

 #endif
 
 #endif
 

-#ifndef TYPE_MC_AAL5
-#define TYPE_MC_AAL5            9
+#ifndef ERF_TYPE_COLOR_HDLC_POS
+#define ERF_TYPE_COLOR_HDLC_POS     10

 #endif
 
 #endif
 

-#ifndef TYPE_COLOR_HDLC_POS
-#define TYPE_COLOR_HDLC_POS     10
+#ifndef ERF_TYPE_COLOR_ETH
+#define ERF_TYPE_COLOR_ETH          11

 #endif
 
 #endif
 

-#ifndef TYPE_COLOR_ETH
-#define TYPE_COLOR_ETH          11
+#ifndef ERF_TYPE_MC_AAL2
+#define ERF_TYPE_MC_AAL2            12

 #endif
 
 #endif
 

-#ifndef TYPE_MC_AAL2
-#define TYPE_MC_AAL2            12
+#ifndef ERF_TYPE_IP_COUNTER
+#define ERF_TYPE_IP_COUNTER         13

 #endif
 
 #endif
 

-#ifndef TYPE_IP_COUNTER
-#define TYPE_IP_COUNTER         13
+#ifndef ERF_TYPE_TCP_FLOW_COUNTER
+#define ERF_TYPE_TCP_FLOW_COUNTER   14

 #endif
 
 #endif
 

-#ifndef TYPE_TCP_FLOW_COUNTER
-#define TYPE_TCP_FLOW_COUNTER   14
+#ifndef ERF_TYPE_DSM_COLOR_HDLC_POS
+#define ERF_TYPE_DSM_COLOR_HDLC_POS 15

 #endif
 
 #endif
 

-#ifndef TYPE_DSM_COLOR_HDLC_POS
-#define TYPE_DSM_COLOR_HDLC_POS 15
+#ifndef ERF_TYPE_DSM_COLOR_ETH
+#define ERF_TYPE_DSM_COLOR_ETH      16

 #endif
 
 #endif
 

-#ifndef TYPE_DSM_COLOR_ETH
-#define TYPE_DSM_COLOR_ETH      16
+#ifndef ERF_TYPE_COLOR_MC_HDLC_POS
+#define ERF_TYPE_COLOR_MC_HDLC_POS  17

 #endif
 
 #endif
 

-#ifndef TYPE_COLOR_MC_HDLC_POS
-#define TYPE_COLOR_MC_HDLC_POS  17
+#ifndef ERF_TYPE_AAL2
+#define ERF_TYPE_AAL2               18

 #endif
 
 #endif
 

-#ifndef TYPE_AAL2
-#define TYPE_AAL2               18
+#ifndef ERF_TYPE_COLOR_HASH_POS
+#define ERF_TYPE_COLOR_HASH_POS     19

 #endif
 
 #endif
 

-#ifndef TYPE_COLOR_HASH_POS
-#define TYPE_COLOR_HASH_POS     19
+#ifndef ERF_TYPE_COLOR_HASH_ETH
+#define ERF_TYPE_COLOR_HASH_ETH     20

 #endif
 
 #endif
 

-#ifndef TYPE_COLOR_HASH_ETH
-#define TYPE_COLOR_HASH_ETH     20
+#ifndef ERF_TYPE_INFINIBAND
+#define ERF_TYPE_INFINIBAND         21

 #endif
 
 #endif
 

-#ifndef TYPE_INFINIBAND
-#define TYPE_INFINIBAND         21
+#ifndef ERF_TYPE_IPV4
+#define ERF_TYPE_IPV4               22

 #endif
 
 #endif
 

-#ifndef TYPE_IPV4
-#define TYPE_IPV4               22
+#ifndef ERF_TYPE_IPV6
+#define ERF_TYPE_IPV6               23

 #endif
 
 #endif
 

-#ifndef TYPE_IPV6
-#define TYPE_IPV6               23
+#ifndef ERF_TYPE_RAW_LINK
+#define ERF_TYPE_RAW_LINK           24

 #endif
 
 #endif
 

-#ifndef TYPE_RAW_LINK
-#define TYPE_RAW_LINK           24
+#ifndef ERF_TYPE_INFINIBAND_LINK
+#define ERF_TYPE_INFINIBAND_LINK    25

 #endif
 
 #endif
 

-#ifndef TYPE_INFINIBAND_LINK
-#define TYPE_INFINIBAND_LINK    25
+#ifndef ERF_TYPE_META
+#define ERF_TYPE_META               27

 #endif
 
 #endif
 

-#ifndef TYPE_PAD
-#define TYPE_PAD                48
+#ifndef ERF_TYPE_PAD
+#define ERF_TYPE_PAD                48

 #endif
 
 #define ATM_CELL_SIZE          52
 #endif
 
 #define ATM_CELL_SIZE          52


@@ -173,20 +169,19 @@ struct sunatm_hdr {
  */
 struct pcap_dag {
        struct pcap_stat stat;
  */
 struct pcap_dag {
        struct pcap_stat stat;

-#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 */
        u_char  *dag_mem_bottom;        /* DAG card current memory bottom pointer */
        u_char  *dag_mem_top;   /* DAG card current memory top pointer */

-#else /* HAVE_DAG_STREAMS_API */
-       void    *dag_mem_base;  /* DAG card memory base address */
-       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_fcs_bits;   /* Number of checksum bits from link layer */

-       int     dag_offset_flags; /* Flags to pass to dag_offset(). */
+       int     dag_flags;      /* Flags */

        int     dag_stream;     /* DAG stream number */
        int     dag_timeout;    /* timeout specified to pcap_open_live.
                                 * Same as in linux above, introduce
                                 * generally? */
        int     dag_stream;     /* DAG stream number */
        int     dag_timeout;    /* timeout specified to pcap_open_live.
                                 * Same as in linux above, introduce
                                 * generally? */

+       dag_card_ref_t dag_ref; /* DAG Configuration/Status API card reference */
+       dag_component_t dag_root;       /* DAG CSAPI Root component */
+       attr_uuid_t drop_attr;  /* DAG Stream Drop Attribute handle, if available */
+       struct timeval required_select_timeout;
+                               /* Timeout caller must use in event loops */

 };
 
 typedef struct pcap_dag_node {
 };
 
 typedef struct pcap_dag_node {


@@ -205,14 +200,20 @@ static const unsigned short endian_test_word = 0x0100;
 
 static unsigned char TempPkt[MAX_DAG_PACKET];
 
 
 static unsigned char TempPkt[MAX_DAG_PACKET];
 

-static int dag_setfilter(pcap_t *p, struct bpf_program *fp);
+#ifndef HAVE_DAG_LARGE_STREAMS_API
+#define dag_attach_stream64(a, b, c, d) dag_attach_stream(a, b, c, d)
+#define dag_get_stream_poll64(a, b, c, d, e) dag_get_stream_poll(a, b, c, d, e)
+#define dag_set_stream_poll64(a, b, c, d, e) dag_set_stream_poll(a, b, c, d, e)
+#define dag_size_t uint32_t
+#endif
+

 static int dag_stats(pcap_t *p, struct pcap_stat *ps);
 static int dag_set_datalink(pcap_t *p, int dlt);
 static int dag_get_datalink(pcap_t *p);
 static int dag_stats(pcap_t *p, struct pcap_stat *ps);
 static int dag_set_datalink(pcap_t *p, int dlt);
 static int dag_get_datalink(pcap_t *p);

-static int dag_setnonblock(pcap_t *p, int nonblock, char *errbuf);
+static int dag_setnonblock(pcap_t *p, int nonblock);

 
 static void
 
 static void

-delete_pcap_dag(pcap_t *p)
+delete_pcap_dag(const pcap_t *p)

 {
        pcap_dag_node_t *curr = NULL, *prev = NULL;
 
 {
        pcap_dag_node_t *curr = NULL, *prev = NULL;
 


@@ -239,24 +240,26 @@ dag_platform_cleanup(pcap_t *p)
 {
        struct pcap_dag *pd = p->priv;
 
 {
        struct pcap_dag *pd = p->priv;
 

-#ifdef HAVE_DAG_STREAMS_API

        if(dag_stop_stream(p->fd, pd->dag_stream) < 0)
                fprintf(stderr,"dag_stop_stream: %s\n", strerror(errno));
 
        if(dag_detach_stream(p->fd, pd->dag_stream) < 0)
                fprintf(stderr,"dag_detach_stream: %s\n", strerror(errno));
        if(dag_stop_stream(p->fd, pd->dag_stream) < 0)
                fprintf(stderr,"dag_stop_stream: %s\n", strerror(errno));
 
        if(dag_detach_stream(p->fd, pd->dag_stream) < 0)
                fprintf(stderr,"dag_detach_stream: %s\n", strerror(errno));

-#else
-       if(dag_stop(p->fd) < 0)
-               fprintf(stderr,"dag_stop: %s\n", strerror(errno));
-#endif /* HAVE_DAG_STREAMS_API */
-       if(p->fd != -1) {
-               if(dag_close(p->fd) < 0)
-                       fprintf(stderr,"dag_close: %s\n", strerror(errno));
+
+       if(pd->dag_ref != NULL) {
+               dag_config_dispose(pd->dag_ref);
+               /*
+                * Note: we don't need to call close(p->fd) or
+                * dag_close(p->fd), as dag_config_dispose(pd->dag_ref)
+                * does this.
+                *
+                * Set p->fd to -1 to make sure that's not done.
+                */

                p->fd = -1;
                p->fd = -1;

+               pd->dag_ref = NULL;

        }
        delete_pcap_dag(p);
        pcap_cleanup_live_common(p);
        }
        delete_pcap_dag(p);
        pcap_cleanup_live_common(p);

-       /* Note: don't need to call close(p->fd) here as dag_close(p->fd) does this. */

 }
 
 static void
 }
 
 static void


@@ -296,7 +299,7 @@ new_pcap_dag(pcap_t *p)
 }
 
 static unsigned int
 }
 
 static unsigned int

-dag_erf_ext_header_count(uint8_t * erf, size_t len)
+dag_erf_ext_header_count(const uint8_t *erf, size_t len)

 {
        uint32_t hdr_num = 0;
        uint8_t  hdr_type;
 {
        uint32_t hdr_num = 0;
        uint8_t  hdr_type;


@@ -330,15 +333,14 @@ dag_erf_ext_header_count(uint8_t * erf, size_t len)
 /*
  *  Read at most max_packets from the capture stream and call the callback
  *  for each of them. Returns the number of packets handled, -1 if an
 /*
  *  Read at most max_packets from the capture stream and call the callback
  *  for each of them. Returns the number of packets handled, -1 if an

- *  error occured, or -2 if we were told to break out of the loop.
+ *  error occurred, or -2 if we were told to break out of the loop.

  */
 static int
 dag_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
 {
        struct pcap_dag *pd = p->priv;
        unsigned int processed = 0;
  */
 static int
 dag_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
 {
        struct pcap_dag *pd = p->priv;
        unsigned int processed = 0;

-       int flags = pd->dag_offset_flags;
-       unsigned int nonblocking = flags & DAGF_NONBLOCK;
+       unsigned int nonblocking = pd->dag_flags & DAGF_NONBLOCK;

        unsigned int num_ext_hdr = 0;
        unsigned int ticks_per_second;
 
        unsigned int num_ext_hdr = 0;
        unsigned int ticks_per_second;
 


@@ -358,7 +360,6 @@ dag_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
                        return -2;
                }
 
                        return -2;
                }
 

-#ifdef HAVE_DAG_STREAMS_API

                /* dag_advance_stream() will block (unless nonblock is called)
                 * until 64kB of data has accumulated.
                 * If to_ms is set, it will timeout before 64kB has accumulated.
                /* dag_advance_stream() will block (unless nonblock is called)
                 * until 64kB of data has accumulated.
                 * If to_ms is set, it will timeout before 64kB has accumulated.


@@ -373,10 +374,6 @@ dag_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
                if ( NULL == (pd->dag_mem_top = dag_advance_stream(p->fd, pd->dag_stream, &(pd->dag_mem_bottom))) ) {
                     return -1;
                }
                if ( NULL == (pd->dag_mem_top = dag_advance_stream(p->fd, pd->dag_stream, &(pd->dag_mem_bottom))) ) {
                     return -1;
                }

-#else
-               /* dag_offset does not support timeouts */
-               pd->dag_mem_top = dag_offset(p->fd, &(pd->dag_mem_bottom), flags);
-#endif /* HAVE_DAG_STREAMS_API */

 
                if (nonblocking && (pd->dag_mem_top - pd->dag_mem_bottom < dag_record_size))
                {
 
                if (nonblocking && (pd->dag_mem_top - pd->dag_mem_bottom < dag_record_size))
                {


@@ -394,18 +391,19 @@ dag_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
 
        }
 
 
        }
 

-       /* Process the packets. */
+       /*
+        * Process the packets.
+        *
+        * This assumes that a single buffer of packets will have
+        * <= INT_MAX packets, so the packet count doesn't overflow.
+        */

        while (pd->dag_mem_top - pd->dag_mem_bottom >= dag_record_size) {
 
                unsigned short packet_len = 0;
                int caplen = 0;
                struct pcap_pkthdr      pcap_header;
 
        while (pd->dag_mem_top - pd->dag_mem_bottom >= dag_record_size) {
 
                unsigned short packet_len = 0;
                int caplen = 0;
                struct pcap_pkthdr      pcap_header;
 

-#ifdef HAVE_DAG_STREAMS_API

                dag_record_t *header = (dag_record_t *)(pd->dag_mem_bottom);
                dag_record_t *header = (dag_record_t *)(pd->dag_mem_bottom);

-#else
-               dag_record_t *header = (dag_record_t *)(pd->dag_mem_base + pd->dag_mem_bottom);
-#endif /* HAVE_DAG_STREAMS_API */

 
                u_char *dp = ((u_char *)header); /* + dag_record_size; */
                unsigned short rlen;
 
                u_char *dp = ((u_char *)header); /* + dag_record_size; */
                unsigned short rlen;


@@ -426,7 +424,8 @@ dag_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
                rlen = ntohs(header->rlen);
                if (rlen < dag_record_size)
                {
                rlen = ntohs(header->rlen);
                if (rlen < dag_record_size)
                {

-                       strncpy(p->errbuf, "dag_read: record too small", PCAP_ERRBUF_SIZE);
+                       pcap_strlcpy(p->errbuf, "dag_read: record too small",
+                           PCAP_ERRBUF_SIZE);

                        return -1;
                }
                pd->dag_mem_bottom += rlen;
                        return -1;
                }
                pd->dag_mem_bottom += rlen;


@@ -434,26 +433,22 @@ dag_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
                /* Count lost packets. */
                switch((header->type & 0x7f)) {
                        /* in these types the color value overwrites the lctr */
                /* Count lost packets. */
                switch((header->type & 0x7f)) {
                        /* in these types the color value overwrites the lctr */

-               case TYPE_COLOR_HDLC_POS:
-               case TYPE_COLOR_ETH:
-               case TYPE_DSM_COLOR_HDLC_POS:
-               case TYPE_DSM_COLOR_ETH:
-               case TYPE_COLOR_MC_HDLC_POS:
-               case TYPE_COLOR_HASH_ETH:
-               case TYPE_COLOR_HASH_POS:
+               case ERF_TYPE_COLOR_HDLC_POS:
+               case ERF_TYPE_COLOR_ETH:
+               case ERF_TYPE_DSM_COLOR_HDLC_POS:
+               case ERF_TYPE_DSM_COLOR_ETH:
+               case ERF_TYPE_COLOR_MC_HDLC_POS:
+               case ERF_TYPE_COLOR_HASH_ETH:
+               case ERF_TYPE_COLOR_HASH_POS:

                        break;
 
                default:
                        break;
 
                default:

-                       if (header->lctr) {
-                               if (pd->stat.ps_drop > (UINT_MAX - ntohs(header->lctr))) {
-                                       pd->stat.ps_drop = UINT_MAX;
-                               } else {
-                                       pd->stat.ps_drop += ntohs(header->lctr);
-                               }
+                       if ( (pd->drop_attr == kNullAttributeUuid) && (header->lctr) ) {
+                               pd->stat.ps_drop += ntohs(header->lctr);

                        }
                }
 
                        }
                }
 

-               if ((header->type & 0x7f) == TYPE_PAD) {
+               if ((header->type & 0x7f) == ERF_TYPE_PAD) {

                        continue;
                }
 
                        continue;
                }
 


@@ -477,20 +472,20 @@ dag_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
                        packet_len = ntohs(header->wlen) + dag_record_size;
                        caplen = rlen;
                        switch ((header->type & 0x7f)) {
                        packet_len = ntohs(header->wlen) + dag_record_size;
                        caplen = rlen;
                        switch ((header->type & 0x7f)) {

-                       case TYPE_MC_AAL5:
-                       case TYPE_MC_ATM:
-                       case TYPE_MC_HDLC:
-                       case TYPE_MC_RAW_CHANNEL:
-                       case TYPE_MC_RAW:
-                       case TYPE_MC_AAL2:
-                       case TYPE_COLOR_MC_HDLC_POS:
+                       case ERF_TYPE_MC_AAL5:
+                       case ERF_TYPE_MC_ATM:
+                       case ERF_TYPE_MC_HDLC:
+                       case ERF_TYPE_MC_RAW_CHANNEL:
+                       case ERF_TYPE_MC_RAW:
+                       case ERF_TYPE_MC_AAL2:
+                       case ERF_TYPE_COLOR_MC_HDLC_POS:

                                packet_len += 4; /* MC header */
                                break;
 
                                packet_len += 4; /* MC header */
                                break;
 

-                       case TYPE_COLOR_HASH_ETH:
-                       case TYPE_DSM_COLOR_ETH:
-                       case TYPE_COLOR_ETH:
-                       case TYPE_ETH:
+                       case ERF_TYPE_COLOR_HASH_ETH:
+                       case ERF_TYPE_DSM_COLOR_ETH:
+                       case ERF_TYPE_COLOR_ETH:
+                       case ERF_TYPE_ETH:

                                packet_len += 2; /* ETH header */
                                break;
                        } /* switch type */
                                packet_len += 2; /* ETH header */
                                break;
                        } /* switch type */


@@ -510,19 +505,19 @@ dag_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
                        dp += 8 * num_ext_hdr;
 
                        switch((header->type & 0x7f)) {
                        dp += 8 * num_ext_hdr;
 
                        switch((header->type & 0x7f)) {

-                       case TYPE_ATM:
-                       case TYPE_AAL5:
-                               if (header->type == TYPE_AAL5) {
+                       case ERF_TYPE_ATM:
+                       case ERF_TYPE_AAL5:
+                               if ((header->type & 0x7f) == ERF_TYPE_AAL5) {

                                        packet_len = ntohs(header->wlen);
                                        caplen = rlen - dag_record_size;
                                }
                                        packet_len = ntohs(header->wlen);
                                        caplen = rlen - dag_record_size;
                                }

-                       case TYPE_MC_ATM:
-                               if (header->type == TYPE_MC_ATM) {
+                       case ERF_TYPE_MC_ATM:
+                               if ((header->type & 0x7f) == ERF_TYPE_MC_ATM) {

                                        caplen = packet_len = ATM_CELL_SIZE;
                                        dp+=4;
                                }
                                        caplen = packet_len = ATM_CELL_SIZE;
                                        dp+=4;
                                }

-                       case TYPE_MC_AAL5:
-                               if (header->type == TYPE_MC_AAL5) {
+                       case ERF_TYPE_MC_AAL5:
+                               if ((header->type & 0x7f) == ERF_TYPE_MC_AAL5) {

                                        packet_len = ntohs(header->wlen);
                                        caplen = rlen - dag_record_size - 4;
                                        dp+=4;
                                        packet_len = ntohs(header->wlen);
                                        caplen = rlen - dag_record_size - 4;
                                        dp+=4;


@@ -530,7 +525,7 @@ dag_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
                                /* Skip over extension headers */
                                caplen -= (8 * num_ext_hdr);
 
                                /* Skip over extension headers */
                                caplen -= (8 * num_ext_hdr);
 

-                               if (header->type == TYPE_ATM) {
+                               if ((header->type & 0x7f) == ERF_TYPE_ATM) {

                                        caplen = packet_len = ATM_CELL_SIZE;
                                }
                                if (p->linktype == DLT_SUNATM) {
                                        caplen = packet_len = ATM_CELL_SIZE;
                                }
                                if (p->linktype == DLT_SUNATM) {


@@ -547,17 +542,21 @@ dag_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
                                                    dp[ATM_HDR_SIZE+1] == 0xaa &&
                                                    dp[ATM_HDR_SIZE+2] == 0x03) ? 2 : 1)));
 
                                                    dp[ATM_HDR_SIZE+1] == 0xaa &&
                                                    dp[ATM_HDR_SIZE+2] == 0x03) ? 2 : 1)));
 

-                               } else {
+                               } else if (p->linktype == DLT_ATM_RFC1483) {

                                        packet_len -= ATM_HDR_SIZE;
                                        caplen -= ATM_HDR_SIZE;
                                        dp += ATM_HDR_SIZE;
                                        packet_len -= ATM_HDR_SIZE;
                                        caplen -= ATM_HDR_SIZE;
                                        dp += ATM_HDR_SIZE;

-                               }
+                               } else
+                                       continue;

                                break;
 
                                break;
 

-                       case TYPE_COLOR_HASH_ETH:
-                       case TYPE_DSM_COLOR_ETH:
-                       case TYPE_COLOR_ETH:
-                       case TYPE_ETH:
+                       case ERF_TYPE_COLOR_HASH_ETH:
+                       case ERF_TYPE_DSM_COLOR_ETH:
+                       case ERF_TYPE_COLOR_ETH:
+                       case ERF_TYPE_ETH:
+                               if ((p->linktype != DLT_EN10MB) &&
+                                   (p->linktype != DLT_DOCSIS))
+                                       continue;

                                packet_len = ntohs(header->wlen);
                                packet_len -= (pd->dag_fcs_bits >> 3);
                                caplen = rlen - dag_record_size - 2;
                                packet_len = ntohs(header->wlen);
                                packet_len -= (pd->dag_fcs_bits >> 3);
                                caplen = rlen - dag_record_size - 2;


@@ -569,10 +568,14 @@ dag_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
                                dp += 2;
                                break;
 
                                dp += 2;
                                break;
 

-                       case TYPE_COLOR_HASH_POS:
-                       case TYPE_DSM_COLOR_HDLC_POS:
-                       case TYPE_COLOR_HDLC_POS:
-                       case TYPE_HDLC_POS:
+                       case ERF_TYPE_COLOR_HASH_POS:
+                       case ERF_TYPE_DSM_COLOR_HDLC_POS:
+                       case ERF_TYPE_COLOR_HDLC_POS:
+                       case ERF_TYPE_HDLC_POS:
+                               if ((p->linktype != DLT_CHDLC) &&
+                                   (p->linktype != DLT_PPP_SERIAL) &&
+                                   (p->linktype != DLT_FRELAY))
+                                       continue;

                                packet_len = ntohs(header->wlen);
                                packet_len -= (pd->dag_fcs_bits >> 3);
                                caplen = rlen - dag_record_size;
                                packet_len = ntohs(header->wlen);
                                packet_len -= (pd->dag_fcs_bits >> 3);
                                caplen = rlen - dag_record_size;


@@ -583,8 +586,15 @@ dag_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
                                }
                                break;
 
                                }
                                break;
 

-                       case TYPE_COLOR_MC_HDLC_POS:
-                       case TYPE_MC_HDLC:
+                       case ERF_TYPE_COLOR_MC_HDLC_POS:
+                       case ERF_TYPE_MC_HDLC:
+                               if ((p->linktype != DLT_CHDLC) &&
+                                   (p->linktype != DLT_PPP_SERIAL) &&
+                                   (p->linktype != DLT_FRELAY) &&
+                                   (p->linktype != DLT_MTP2) &&
+                                   (p->linktype != DLT_MTP2_WITH_PHDR) &&
+                                   (p->linktype != DLT_LAPD))
+                                       continue;

                                packet_len = ntohs(header->wlen);
                                packet_len -= (pd->dag_fcs_bits >> 3);
                                caplen = rlen - dag_record_size - 4;
                                packet_len = ntohs(header->wlen);
                                packet_len -= (pd->dag_fcs_bits >> 3);
                                caplen = rlen - dag_record_size - 4;


@@ -611,8 +621,23 @@ dag_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
 #endif
                                break;
 
 #endif
                                break;
 

-                       case TYPE_IPV4:
-                       case TYPE_IPV6:
+                       case ERF_TYPE_IPV4:
+                               if ((p->linktype != DLT_RAW) &&
+                                   (p->linktype != DLT_IPV4))
+                                       continue;
+                               packet_len = ntohs(header->wlen);
+                               caplen = rlen - dag_record_size;
+                               /* Skip over extension headers */
+                               caplen -= (8 * num_ext_hdr);
+                               if (caplen > packet_len) {
+                                       caplen = packet_len;
+                               }
+                               break;
+
+                       case ERF_TYPE_IPV6:
+                               if ((p->linktype != DLT_RAW) &&
+                                   (p->linktype != DLT_IPV6))
+                                       continue;

                                packet_len = ntohs(header->wlen);
                                caplen = rlen - dag_record_size;
                                /* Skip over extension headers */
                                packet_len = ntohs(header->wlen);
                                caplen = rlen - dag_record_size;
                                /* Skip over extension headers */


@@ -623,13 +648,13 @@ dag_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
                                break;
 
                        /* These types have no matching 'native' DLT, but can be used with DLT_ERF above */
                                break;
 
                        /* These types have no matching 'native' DLT, but can be used with DLT_ERF above */

-                       case TYPE_MC_RAW:
-                       case TYPE_MC_RAW_CHANNEL:
-                       case TYPE_IP_COUNTER:
-                       case TYPE_TCP_FLOW_COUNTER:
-                       case TYPE_INFINIBAND:
-                       case TYPE_RAW_LINK:
-                       case TYPE_INFINIBAND_LINK:
+                       case ERF_TYPE_MC_RAW:
+                       case ERF_TYPE_MC_RAW_CHANNEL:
+                       case ERF_TYPE_IP_COUNTER:
+                       case ERF_TYPE_TCP_FLOW_COUNTER:
+                       case ERF_TYPE_INFINIBAND:
+                       case ERF_TYPE_RAW_LINK:
+                       case ERF_TYPE_INFINIBAND_LINK:

                        default:
                                /* Unhandled ERF type.
                                 * Ignore rather than generating error
                        default:
                                /* Unhandled ERF type.
                                 * Ignore rather than generating error


@@ -643,7 +668,7 @@ dag_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
                        caplen = p->snapshot;
 
                /* Run the packet filter if there is one. */
                        caplen = p->snapshot;
 
                /* Run the packet filter if there is one. */

-               if ((p->fcode.bf_insns == NULL) || bpf_filter(p->fcode.bf_insns, dp, packet_len, caplen)) {
+               if ((p->fcode.bf_insns == NULL) || pcap_filter(p->fcode.bf_insns, dp, packet_len, caplen)) {

 
                        /* convert between timestamp formats */
                        register unsigned long long ts;
 
                        /* convert between timestamp formats */
                        register unsigned long long ts;


@@ -697,9 +722,9 @@ dag_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
 }
 
 static int
 }
 
 static int

-dag_inject(pcap_t *p, const void *buf _U_, size_t size _U_)
+dag_inject(pcap_t *p, const void *buf _U_, int size _U_)

 {
 {

-       strlcpy(p->errbuf, "Sending packets isn't supported on DAG cards",
+       pcap_strlcpy(p->errbuf, "Sending packets isn't supported on DAG cards",

            PCAP_ERRBUF_SIZE);
        return (-1);
 }
            PCAP_ERRBUF_SIZE);
        return (-1);
 }


@@ -711,90 +736,141 @@ dag_inject(pcap_t *p, const void *buf _U_, size_t size _U_)
  *  API polling parameters.
  *
  *  snaplen is now also ignored, until we get per-stream slen support. Set
  *  API polling parameters.
  *
  *  snaplen is now also ignored, until we get per-stream slen support. Set

- *  slen with approprite DAG tool BEFORE pcap_activate().
+ *  slen with appropriate DAG tool BEFORE pcap_activate().

  *
  *  See also pcap(3).
  */
  *
  *  See also pcap(3).
  */

-static int dag_activate(pcap_t* handle)
+static int dag_activate(pcap_t* p)

 {
 {

-       struct pcap_dag *handlep = handle->priv;
-#if 0
-       char conf[30]; /* dag configure string */
-#endif
+       struct pcap_dag *pd = p->priv;

        char *s;
        int n;
        daginf_t* daginf;
        char * newDev = NULL;
        char *s;
        int n;
        daginf_t* daginf;
        char * newDev = NULL;

-       char * device = handle->opt.device;
-#ifdef HAVE_DAG_STREAMS_API
-       uint32_t mindata;
+       char * device = p->opt.device;
+       int ret;
+       dag_size_t mindata;

        struct timeval maxwait;
        struct timeval poll;
        struct timeval maxwait;
        struct timeval poll;

-#endif

 
        if (device == NULL) {
 
        if (device == NULL) {

-               pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "device is NULL: %s", pcap_strerror(errno));
-               return -1;
+               snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "device is NULL");
+               return PCAP_ERROR;

        }
 
        /* Initialize some components of the pcap structure. */
        }
 
        /* Initialize some components of the pcap structure. */

-
-#ifdef HAVE_DAG_STREAMS_API

        newDev = (char *)malloc(strlen(device) + 16);
        if (newDev == NULL) {
        newDev = (char *)malloc(strlen(device) + 16);
        if (newDev == NULL) {

-               pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Can't allocate string for device name: %s", pcap_strerror(errno));
+               ret = PCAP_ERROR;
+               pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "Can't allocate string for device name");

                goto fail;
        }
 
        /* Parse input name to get dag device and stream number if provided */
                goto fail;
        }
 
        /* Parse input name to get dag device and stream number if provided */

-       if (dag_parse_name(device, newDev, strlen(device) + 16, &handlep->dag_stream) < 0) {
-               pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "dag_parse_name: %s", pcap_strerror(errno));
+       if (dag_parse_name(device, newDev, strlen(device) + 16, &pd->dag_stream) < 0) {
+               /*
+                * XXX - it'd be nice if this indicated what was wrong
+                * with the name.  Does this reliably set errno?
+                * Should this return PCAP_ERROR_NO_SUCH_DEVICE in some
+                * cases?
+                */
+               ret = PCAP_ERROR;
+               pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "dag_parse_name");

                goto fail;
        }
        device = newDev;
 
                goto fail;
        }
        device = newDev;
 

-       if (handlep->dag_stream%2) {
-               pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "dag_parse_name: tx (even numbered) streams not supported for capture");
+       if (pd->dag_stream%2) {
+               ret = PCAP_ERROR;
+               snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "dag_parse_name: tx (even numbered) streams not supported for capture");

                goto fail;
        }
                goto fail;
        }

-#else
-       if (strncmp(device, "/dev/", 5) != 0) {
-               newDev = (char *)malloc(strlen(device) + 5);
-               if (newDev == NULL) {
-                       pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Can't allocate string for device name: %s", pcap_strerror(errno));
-                       goto fail;
-               }
-               strcpy(newDev, "/dev/");
-               strcat(newDev, device);
-               device = newDev;
-       }
-#endif /* HAVE_DAG_STREAMS_API */

 
        /* setup device parameters */
 
        /* setup device parameters */

-       if((handle->fd = dag_open((char *)device)) < 0) {
-               pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "dag_open %s: %s", device, pcap_strerror(errno));
+       if((pd->dag_ref = dag_config_init((char *)device)) == NULL) {
+               /*
+                * XXX - does this reliably set errno?
+                */
+               if (errno == ENOENT) {
+                       /*
+                        * There's nothing more to say, so clear
+                        * the error message.
+                        */
+                       ret = PCAP_ERROR_NO_SUCH_DEVICE;
+                       p->errbuf[0] = '\0';
+               } else if (errno == EPERM || errno == EACCES) {
+                       ret = PCAP_ERROR_PERM_DENIED;
+                       snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+                           "Attempt to open %s failed with %s - additional privileges may be required",
+                           device, (errno == EPERM) ? "EPERM" : "EACCES");
+               } else {
+                       ret = PCAP_ERROR;
+                       pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                           errno, "dag_config_init %s", device);
+               }

                goto fail;
        }
 
                goto fail;
        }
 

-#ifdef HAVE_DAG_STREAMS_API
+       if((p->fd = dag_config_get_card_fd(pd->dag_ref)) < 0) {
+               /*
+                * XXX - does this reliably set errno?
+                */
+               ret = PCAP_ERROR;
+               pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "dag_config_get_card_fd %s", device);
+               goto failclose;
+       }
+

        /* Open requested stream. Can fail if already locked or on error */
        /* Open requested stream. Can fail if already locked or on error */

-       if (dag_attach_stream(handle->fd, handlep->dag_stream, 0, 0) < 0) {
-               pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "dag_attach_stream: %s", pcap_strerror(errno));
+       if (dag_attach_stream64(p->fd, pd->dag_stream, 0, 0) < 0) {
+               ret = PCAP_ERROR;
+               pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "dag_attach_stream");

                goto failclose;
        }
 
                goto failclose;
        }
 

+       /* Try to find Stream Drop attribute */
+       pd->drop_attr = kNullAttributeUuid;
+       pd->dag_root = dag_config_get_root_component(pd->dag_ref);
+       if ( dag_component_get_subcomponent(pd->dag_root, kComponentStreamFeatures, 0) )
+       {
+               pd->drop_attr = dag_config_get_indexed_attribute_uuid(pd->dag_ref, kUint32AttributeStreamDropCount, pd->dag_stream/2);
+       }
+

        /* Set up default poll parameters for stream
         * Can be overridden by pcap_set_nonblock()
         */
        /* Set up default poll parameters for stream
         * Can be overridden by pcap_set_nonblock()
         */

-       if (dag_get_stream_poll(handle->fd, handlep->dag_stream,
+       if (dag_get_stream_poll64(p->fd, pd->dag_stream,

                                &mindata, &maxwait, &poll) < 0) {
                                &mindata, &maxwait, &poll) < 0) {

-               pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "dag_get_stream_poll: %s", pcap_strerror(errno));
+               ret = PCAP_ERROR;
+               pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "dag_get_stream_poll");

                goto faildetach;
        }
 
                goto faildetach;
        }
 

-       if (handle->opt.immediate) {
+       /* Use the poll time as the required select timeout for callers
+        * who are using select()/etc. in an event loop waiting for
+        * packets to arrive.
+        */
+       pd->required_select_timeout = poll;
+       p->required_select_timeout = &pd->required_select_timeout;
+
+       /*
+        * Turn a negative snapshot value (invalid), a snapshot value of
+        * 0 (unspecified), or a value bigger than the normal maximum
+        * value, into the maximum allowed value.
+        *
+        * If some application really *needs* a bigger snapshot
+        * length, we should just increase MAXIMUM_SNAPLEN.
+        */
+       if (p->snapshot <= 0 || p->snapshot > MAXIMUM_SNAPLEN)
+               p->snapshot = MAXIMUM_SNAPLEN;
+
+       if (p->opt.immediate) {

                /* Call callback immediately.
                /* Call callback immediately.

-                * XXX - is this the right way to handle this?
+                * XXX - is this the right way to p this?

                 */
                mindata = 0;
        } else {
                 */
                mindata = 0;
        } else {


@@ -808,23 +884,17 @@ static int dag_activate(pcap_t* handle)
        /* Obey opt.timeout (was to_ms) if supplied. This is a good idea!
         * Recommend 10-100ms. Calls will time out even if no data arrived.
         */
        /* Obey opt.timeout (was to_ms) if supplied. This is a good idea!
         * Recommend 10-100ms. Calls will time out even if no data arrived.
         */

-       maxwait.tv_sec = handle->opt.timeout/1000;
-       maxwait.tv_usec = (handle->opt.timeout%1000) * 1000;
+       maxwait.tv_sec = p->opt.timeout/1000;
+       maxwait.tv_usec = (p->opt.timeout%1000) * 1000;

 
 

-       if (dag_set_stream_poll(handle->fd, handlep->dag_stream,
+       if (dag_set_stream_poll64(p->fd, pd->dag_stream,

                                mindata, &maxwait, &poll) < 0) {
                                mindata, &maxwait, &poll) < 0) {

-               pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "dag_set_stream_poll: %s", pcap_strerror(errno));
+               ret = PCAP_ERROR;
+               pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "dag_set_stream_poll");

                goto faildetach;
        }
 
                goto faildetach;
        }
 

-#else
-       if((handlep->dag_mem_base = dag_mmap(handle->fd)) == MAP_FAILED) {
-               pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,"dag_mmap %s: %s", device, pcap_strerror(errno));
-               goto failclose;
-       }
-
-#endif /* HAVE_DAG_STREAMS_API */
-

         /* XXX Not calling dag_configure() to set slen; this is unsafe in
         * multi-stream environments as the gpp config is global.
          * Once the firmware provides 'per-stream slen' this can be supported
         /* XXX Not calling dag_configure() to set slen; this is unsafe in
         * multi-stream environments as the gpp config is global.
          * Once the firmware provides 'per-stream slen' this can be supported


@@ -833,63 +903,53 @@ static int dag_activate(pcap_t* handle)
        /* set the card snap length to the specified snaplen parameter */
        /* This is a really bad idea, as different cards have different
         * valid slen ranges. Should fix in Config API. */
        /* set the card snap length to the specified snaplen parameter */
        /* This is a really bad idea, as different cards have different
         * valid slen ranges. Should fix in Config API. */

-       if (handle->snapshot == 0 || handle->snapshot > MAX_DAG_SNAPLEN) {
-               handle->snapshot = MAX_DAG_SNAPLEN;
+       if (p->snapshot == 0 || p->snapshot > MAX_DAG_SNAPLEN) {
+               p->snapshot = MAX_DAG_SNAPLEN;

        } else if (snaplen < MIN_DAG_SNAPLEN) {
        } else if (snaplen < MIN_DAG_SNAPLEN) {

-               handle->snapshot = MIN_DAG_SNAPLEN;
+               p->snapshot = MIN_DAG_SNAPLEN;

        }
        /* snap len has to be a multiple of 4 */
        }
        /* snap len has to be a multiple of 4 */

-       pcap_snprintf(conf, 30, "varlen slen=%d", (snaplen + 3) & ~3);
-
-       if(dag_configure(handle->fd, conf) < 0) {
-               pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,"dag_configure %s: %s", device, pcap_strerror(errno));
-               goto faildetach;
-       }

 #endif
 
 #endif
 

-#ifdef HAVE_DAG_STREAMS_API
-       if(dag_start_stream(handle->fd, handlep->dag_stream) < 0) {
-               pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "dag_start_stream %s: %s", device, pcap_strerror(errno));
+       if(dag_start_stream(p->fd, pd->dag_stream) < 0) {
+               ret = PCAP_ERROR;
+               pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "dag_start_stream %s", device);

                goto faildetach;
        }
                goto faildetach;
        }

-#else
-       if(dag_start(handle->fd) < 0) {
-               pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "dag_start %s: %s", device, pcap_strerror(errno));
-               goto failclose;
-       }
-#endif /* HAVE_DAG_STREAMS_API */

 
        /*
         * Important! You have to ensure bottom is properly
         * initialized to zero on startup, it won't give you
         * a compiler warning if you make this mistake!
         */
 
        /*
         * Important! You have to ensure bottom is properly
         * initialized to zero on startup, it won't give you
         * a compiler warning if you make this mistake!
         */

-       handlep->dag_mem_bottom = 0;
-       handlep->dag_mem_top = 0;
+       pd->dag_mem_bottom = 0;
+       pd->dag_mem_top = 0;

 
        /*
         * Find out how many FCS bits we should strip.
         * First, query the card to see if it strips the FCS.
         */
 
        /*
         * Find out how many FCS bits we should strip.
         * First, query the card to see if it strips the FCS.
         */

-       daginf = dag_info(handle->fd);
+       daginf = dag_info(p->fd);

        if ((0x4200 == daginf->device_code) || (0x4230 == daginf->device_code)) {
                /* DAG 4.2S and 4.23S already strip the FCS.  Stripping the final word again truncates the packet. */
        if ((0x4200 == daginf->device_code) || (0x4230 == daginf->device_code)) {
                /* DAG 4.2S and 4.23S already strip the FCS.  Stripping the final word again truncates the packet. */

-               handlep->dag_fcs_bits = 0;
+               pd->dag_fcs_bits = 0;

 
                /* Note that no FCS will be supplied. */
 
                /* Note that no FCS will be supplied. */

-               handle->linktype_ext = LT_FCS_DATALINK_EXT(0);
+               p->linktype_ext = LT_FCS_DATALINK_EXT(0);

        } else {
                /*
                 * Start out assuming it's 32 bits.
                 */
        } else {
                /*
                 * Start out assuming it's 32 bits.
                 */

-               handlep->dag_fcs_bits = 32;
+               pd->dag_fcs_bits = 32;

 
                /* Allow an environment variable to override. */
                if ((s = getenv("ERF_FCS_BITS")) != NULL) {
                        if ((n = atoi(s)) == 0 || n == 16 || n == 32) {
 
                /* Allow an environment variable to override. */
                if ((s = getenv("ERF_FCS_BITS")) != NULL) {
                        if ((n = atoi(s)) == 0 || n == 16 || n == 32) {

-                               handlep->dag_fcs_bits = n;
+                               pd->dag_fcs_bits = n;

                        } else {
                        } else {

-                               pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
+                               ret = PCAP_ERROR;
+                               snprintf(p->errbuf, PCAP_ERRBUF_SIZE,

                                        "pcap_activate %s: bad ERF_FCS_BITS value (%d) in environment", device, n);
                                goto failstop;
                        }
                                        "pcap_activate %s: bad ERF_FCS_BITS value (%d) in environment", device, n);
                                goto failstop;
                        }


@@ -899,78 +959,83 @@ static int dag_activate(pcap_t* handle)
                 * Did the user request that they not be stripped?
                 */
                if ((s = getenv("ERF_DONT_STRIP_FCS")) != NULL) {
                 * Did the user request that they not be stripped?
                 */
                if ((s = getenv("ERF_DONT_STRIP_FCS")) != NULL) {

-                       /* Yes.  Note the number of bytes that will be
+                       /* Yes.  Note the number of 16-bit words that will be

                           supplied. */
                           supplied. */

-                       handle->linktype_ext = LT_FCS_DATALINK_EXT(handlep->dag_fcs_bits/16);
+                       p->linktype_ext = LT_FCS_DATALINK_EXT(pd->dag_fcs_bits/16);

 
                        /* And don't strip them. */
 
                        /* And don't strip them. */

-                       handlep->dag_fcs_bits = 0;
+                       pd->dag_fcs_bits = 0;

                }
        }
 
                }
        }
 

-       handlep->dag_timeout    = handle->opt.timeout;
+       pd->dag_timeout = p->opt.timeout;

 
 

-       handle->linktype = -1;
-       if (dag_get_datalink(handle) < 0)
+       p->linktype = -1;
+       if (dag_get_datalink(p) < 0) {
+               ret = PCAP_ERROR;

                goto failstop;
                goto failstop;

+       }

 
 

-       handle->bufsize = 0;
+       p->bufsize = 0;

 
 

-       if (new_pcap_dag(handle) < 0) {
-               pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "new_pcap_dag %s: %s", device, pcap_strerror(errno));
+       if (new_pcap_dag(p) < 0) {
+               ret = PCAP_ERROR;
+               pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "new_pcap_dag %s", device);

                goto failstop;
        }
 
        /*
         * "select()" and "poll()" don't work on DAG device descriptors.
         */
                goto failstop;
        }
 
        /*
         * "select()" and "poll()" don't work on DAG device descriptors.
         */

-       handle->selectable_fd = -1;
+       p->selectable_fd = -1;

 
        if (newDev != NULL) {
                free((char *)newDev);
        }
 
 
        if (newDev != NULL) {
                free((char *)newDev);
        }
 

-       handle->read_op = dag_read;
-       handle->inject_op = dag_inject;
-       handle->setfilter_op = dag_setfilter;
-       handle->setdirection_op = NULL; /* Not implemented.*/
-       handle->set_datalink_op = dag_set_datalink;
-       handle->getnonblock_op = pcap_getnonblock_fd;
-       handle->setnonblock_op = dag_setnonblock;
-       handle->stats_op = dag_stats;
-       handle->cleanup_op = dag_platform_cleanup;
-       handlep->stat.ps_drop = 0;
-       handlep->stat.ps_recv = 0;
-       handlep->stat.ps_ifdrop = 0;
+       p->read_op = dag_read;
+       p->inject_op = dag_inject;
+       p->setfilter_op = install_bpf_program;
+       p->setdirection_op = NULL; /* Not implemented.*/
+       p->set_datalink_op = dag_set_datalink;
+       p->getnonblock_op = pcap_getnonblock_fd;
+       p->setnonblock_op = dag_setnonblock;
+       p->stats_op = dag_stats;
+       p->cleanup_op = dag_platform_cleanup;
+       pd->stat.ps_drop = 0;
+       pd->stat.ps_recv = 0;
+       pd->stat.ps_ifdrop = 0;

        return 0;
 
        return 0;
 

-#ifdef HAVE_DAG_STREAMS_API

 failstop:
 failstop:

-       if (dag_stop_stream(handle->fd, handlep->dag_stream) < 0) {
+       if (dag_stop_stream(p->fd, pd->dag_stream) < 0) {

                fprintf(stderr,"dag_stop_stream: %s\n", strerror(errno));
        }
 
 faildetach:
                fprintf(stderr,"dag_stop_stream: %s\n", strerror(errno));
        }
 
 faildetach:

-       if (dag_detach_stream(handle->fd, handlep->dag_stream) < 0)
+       if (dag_detach_stream(p->fd, pd->dag_stream) < 0)

                fprintf(stderr,"dag_detach_stream: %s\n", strerror(errno));
                fprintf(stderr,"dag_detach_stream: %s\n", strerror(errno));

-#else
-failstop:
-       if (dag_stop(handle->fd) < 0)
-               fprintf(stderr,"dag_stop: %s\n", strerror(errno));
-#endif /* HAVE_DAG_STREAMS_API */

 
 failclose:
 
 failclose:

-       if (dag_close(handle->fd) < 0)
-               fprintf(stderr,"dag_close: %s\n", strerror(errno));
-       delete_pcap_dag(handle);
+       dag_config_dispose(pd->dag_ref);
+       /*
+        * Note: we don't need to call close(p->fd) or dag_close(p->fd),
+        * as dag_config_dispose(pd->dag_ref) does this.
+        *
+        * Set p->fd to -1 to make sure that's not done.
+        */
+       p->fd = -1;
+       pd->dag_ref = NULL;
+       delete_pcap_dag(p);

 
 fail:
 
 fail:

-       pcap_cleanup_live_common(handle);
+       pcap_cleanup_live_common(p);

        if (newDev != NULL) {
                free((char *)newDev);
        }
 
        if (newDev != NULL) {
                free((char *)newDev);
        }
 

-       return PCAP_ERROR;
+       return ret;

 }
 
 pcap_t *dag_create(const char *device, char *ebuf, int *is_ours)
 }
 
 pcap_t *dag_create(const char *device, char *ebuf, int *is_ours)


@@ -979,9 +1044,7 @@ pcap_t *dag_create(const char *device, char *ebuf, int *is_ours)
        char *cpend;
        long devnum;
        pcap_t *p;
        char *cpend;
        long devnum;
        pcap_t *p;

-#ifdef HAVE_DAG_STREAMS_API

        long stream = 0;
        long stream = 0;

-#endif

 
        /* Does this look like a DAG device? */
        cp = strrchr(device, '/');
 
        /* Does this look like a DAG device? */
        cp = strrchr(device, '/');


@@ -996,34 +1059,33 @@ pcap_t *dag_create(const char *device, char *ebuf, int *is_ours)
        /* Yes - is "dag" followed by a number from 0 to DAG_MAX_BOARDS-1 */
        cp += 3;
        devnum = strtol(cp, &cpend, 10);
        /* Yes - is "dag" followed by a number from 0 to DAG_MAX_BOARDS-1 */
        cp += 3;
        devnum = strtol(cp, &cpend, 10);

-#ifdef HAVE_DAG_STREAMS_API

        if (*cpend == ':') {
                /* Followed by a stream number. */
                stream = strtol(++cpend, &cpend, 10);
        }
        if (*cpend == ':') {
                /* Followed by a stream number. */
                stream = strtol(++cpend, &cpend, 10);
        }

-#endif
+

        if (cpend == cp || *cpend != '\0') {
                /* Not followed by a number. */
                *is_ours = 0;
                return NULL;
        }
        if (cpend == cp || *cpend != '\0') {
                /* Not followed by a number. */
                *is_ours = 0;
                return NULL;
        }

+

        if (devnum < 0 || devnum >= DAG_MAX_BOARDS) {
                /* Followed by a non-valid number. */
                *is_ours = 0;
                return NULL;
        }
        if (devnum < 0 || devnum >= DAG_MAX_BOARDS) {
                /* Followed by a non-valid number. */
                *is_ours = 0;
                return NULL;
        }

-#ifdef HAVE_DAG_STREAMS_API
+

        if (stream <0 || stream >= DAG_STREAM_MAX) {
                /* Followed by a non-valid stream number. */
                *is_ours = 0;
                return NULL;
        }
        if (stream <0 || stream >= DAG_STREAM_MAX) {
                /* Followed by a non-valid stream number. */
                *is_ours = 0;
                return NULL;
        }

-#endif

 
        /* OK, it's probably ours. */
        *is_ours = 1;
 
 
        /* OK, it's probably ours. */
        *is_ours = 1;
 

-       p = pcap_create_common(ebuf, sizeof (struct pcap_dag));
+       p = PCAP_CREATE_COMMON(ebuf, struct pcap_dag);

        if (p == NULL)
                return NULL;
 
        if (p == NULL)
                return NULL;
 


@@ -1036,28 +1098,44 @@ pcap_t *dag_create(const char *device, char *ebuf, int *is_ours)
         * XXX Our native precision is 2^-32s, but libpcap doesn't support
         * power of two precisions yet. We can convert to either MICRO or NANO.
         */
         * XXX Our native precision is 2^-32s, but libpcap doesn't support
         * power of two precisions yet. We can convert to either MICRO or NANO.
         */

-       p->tstamp_precision_count = 2;

        p->tstamp_precision_list = malloc(2 * sizeof(u_int));
        if (p->tstamp_precision_list == NULL) {
        p->tstamp_precision_list = malloc(2 * sizeof(u_int));
        if (p->tstamp_precision_list == NULL) {

-               pcap_snprintf(ebuf, PCAP_ERRBUF_SIZE, "malloc: %s",
-                   pcap_strerror(errno));
+               pcap_fmt_errmsg_for_errno(ebuf, PCAP_ERRBUF_SIZE,
+                   errno, "malloc");

                pcap_close(p);
                return NULL;
        }
        p->tstamp_precision_list[0] = PCAP_TSTAMP_PRECISION_MICRO;
        p->tstamp_precision_list[1] = PCAP_TSTAMP_PRECISION_NANO;
                pcap_close(p);
                return NULL;
        }
        p->tstamp_precision_list[0] = PCAP_TSTAMP_PRECISION_MICRO;
        p->tstamp_precision_list[1] = PCAP_TSTAMP_PRECISION_NANO;

+       p->tstamp_precision_count = 2;

        return p;
 }
 
 static int
 dag_stats(pcap_t *p, struct pcap_stat *ps) {
        struct pcap_dag *pd = p->priv;
        return p;
 }
 
 static int
 dag_stats(pcap_t *p, struct pcap_stat *ps) {
        struct pcap_dag *pd = p->priv;

+       uint32_t stream_drop;
+       dag_err_t dag_error;
+
+       /*
+        * Packet records received (ps_recv) are counted in dag_read().
+        * Packet records dropped (ps_drop) are read from Stream Drop attribute if present,
+        * otherwise integrate the ERF Header lctr counts (if available) in dag_read().
+        * We are reporting that no records are dropped by the card/driver (ps_ifdrop).
+        */

 
 

-       /* This needs to be filled out correctly.  Hopefully a dagapi call will
-                provide all necessary information.
-       */
-       /*pd->stat.ps_recv = 0;*/
-       /*pd->stat.ps_drop = 0;*/
+       if(pd->drop_attr != kNullAttributeUuid) {
+               /* Note this counter is cleared at start of capture and will wrap at UINT_MAX.
+                * The application is responsible for polling ps_drop frequently enough
+                * to detect each wrap and integrate total drop with a wider counter */
+               if ((dag_error = dag_config_get_uint32_attribute_ex(pd->dag_ref, pd->drop_attr, &stream_drop)) == kDagErrNone) {
+                       pd->stat.ps_drop = stream_drop;
+               } else {
+                       snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "reading stream drop attribute: %s",
+                                dag_config_strerror(dag_error));
+                       return -1;
+               }
+       }

 
        *ps = pd->stat;
 
 
        *ps = pd->stat;
 


@@ -1065,95 +1143,71 @@ dag_stats(pcap_t *p, struct pcap_stat *ps) {
 }
 
 /*
 }
 
 /*

- * Previously we just generated a list of all possible names and let
- * pcap_add_if() attempt to open each one, but with streams this adds up
- * to 81 possibilities which is inefficient.
- *
- * Since we know more about the devices we can prune the tree here.
- * pcap_add_if() will still retest each device but the total number of
- * open attempts will still be much less than the naive approach.
+ * Add all DAG devices.

  */
 int
  */
 int

-dag_findalldevs(pcap_if_t **devlistp, char *errbuf)
+dag_findalldevs(pcap_if_list_t *devlistp, char *errbuf)

 {
        char name[12];  /* XXX - pick a size */
 {
        char name[12];  /* XXX - pick a size */

-       int ret = 0;

        int c;
        char dagname[DAGNAME_BUFSIZE];
        int dagstream;
        int dagfd;
        dag_card_inf_t *inf;
        char *description;
        int c;
        char dagname[DAGNAME_BUFSIZE];
        int dagstream;
        int dagfd;
        dag_card_inf_t *inf;
        char *description;

+       int stream, rxstreams;

 
        /* Try all the DAGs 0-DAG_MAX_BOARDS */
        for (c = 0; c < DAG_MAX_BOARDS; c++) {
 
        /* Try all the DAGs 0-DAG_MAX_BOARDS */
        for (c = 0; c < DAG_MAX_BOARDS; c++) {

-               pcap_snprintf(name, 12, "dag%d", c);
+               snprintf(name, 12, "dag%d", c);

                if (-1 == dag_parse_name(name, dagname, DAGNAME_BUFSIZE, &dagstream))
                {
                if (-1 == dag_parse_name(name, dagname, DAGNAME_BUFSIZE, &dagstream))
                {

-                       return -1;
+                       (void) snprintf(errbuf, PCAP_ERRBUF_SIZE,
+                           "dag: device name %s can't be parsed", name);
+                       return (-1);

                }
                }

-               description = NULL;

                if ( (dagfd = dag_open(dagname)) >= 0 ) {
                if ( (dagfd = dag_open(dagname)) >= 0 ) {

+                       description = NULL;

                        if ((inf = dag_pciinfo(dagfd)))
                                description = dag_device_name(inf->device_code, 1);
                        if ((inf = dag_pciinfo(dagfd)))
                                description = dag_device_name(inf->device_code, 1);

-                       if (pcap_add_if(devlistp, name, 0, description, errbuf) == -1) {
+                       /*
+                        * XXX - is there a way to determine whether
+                        * the card is plugged into a network or not?
+                        * If so, we should check that and set
+                        * PCAP_IF_CONNECTION_STATUS_CONNECTED or
+                        * PCAP_IF_CONNECTION_STATUS_DISCONNECTED.
+                        *
+                        * Also, are there notions of "up" and "running"?
+                        */
+                       if (add_dev(devlistp, name, 0, description, errbuf) == NULL) {

                                /*
                                 * Failure.
                                 */
                                /*
                                 * Failure.
                                 */

-                               ret = -1;
+                               return (-1);

                        }
                        }

-#ifdef HAVE_DAG_STREAMS_API
-                       {
-                               int stream, rxstreams;
-                               rxstreams = dag_rx_get_stream_count(dagfd);
-                               for(stream=0;stream<DAG_STREAM_MAX;stream+=2) {
-                                       if (0 == dag_attach_stream(dagfd, stream, 0, 0)) {
-                                               dag_detach_stream(dagfd, stream);
-
-                                               pcap_snprintf(name,  10, "dag%d:%d", c, stream);
-                                               if (pcap_add_if(devlistp, name, 0, description, errbuf) == -1) {
-                                                       /*
-                                                        * Failure.
-                                                        */
-                                                       ret = -1;
-                                               }
-
-                                               rxstreams--;
-                                               if(rxstreams <= 0) {
-                                                       break;
-                                               }
+                       rxstreams = dag_rx_get_stream_count(dagfd);
+                       for(stream=0;stream<DAG_STREAM_MAX;stream+=2) {
+                               if (0 == dag_attach_stream64(dagfd, stream, 0, 0)) {
+                                       dag_detach_stream(dagfd, stream);
+
+                                       snprintf(name,  10, "dag%d:%d", c, stream);
+                                       if (add_dev(devlistp, name, 0, description, errbuf) == NULL) {
+                                               /*
+                                                * Failure.
+                                                */
+                                               return (-1);
+                                       }
+
+                                       rxstreams--;
+                                       if(rxstreams <= 0) {
+                                               break;

                                        }
                                }
                        }
                                        }
                                }
                        }

-#endif  /* HAVE_DAG_STREAMS_API */

                        dag_close(dagfd);
                }
 
        }
                        dag_close(dagfd);
                }
 
        }

-       return (ret);
-}
-
-/*
- * Installs the given bpf filter program in the given pcap structure.  There is
- * no attempt to store the filter in kernel memory as that is not supported
- * with DAG cards.
- */
-static int
-dag_setfilter(pcap_t *p, struct bpf_program *fp)
-{
-       if (!p)
-               return -1;
-       if (!fp) {
-               strncpy(p->errbuf, "setfilter: No filter specified",
-                       sizeof(p->errbuf));
-               return -1;
-       }
-
-       /* Make our private copy of the filter */
-
-       if (install_bpf_program(p, fp) < 0)
-               return -1;
-

        return (0);
 }
 
        return (0);
 }
 


@@ -1166,50 +1220,49 @@ dag_set_datalink(pcap_t *p, int dlt)
 }
 
 static int
 }
 
 static int

-dag_setnonblock(pcap_t *p, int nonblock, char *errbuf)
+dag_setnonblock(pcap_t *p, int nonblock)

 {
        struct pcap_dag *pd = p->priv;
 {
        struct pcap_dag *pd = p->priv;

+       dag_size_t mindata;
+       struct timeval maxwait;
+       struct timeval poll;

 
        /*
         * Set non-blocking mode on the FD.
         * XXX - is that necessary?  If not, don't bother calling it,
         * and have a "dag_getnonblock()" function that looks at
 
        /*
         * Set non-blocking mode on the FD.
         * XXX - is that necessary?  If not, don't bother calling it,
         * and have a "dag_getnonblock()" function that looks at

-        * "pd->dag_offset_flags".
+        * "pd->dag_flags".

         */
         */

-       if (pcap_setnonblock_fd(p, nonblock, errbuf) < 0)
+       if (pcap_setnonblock_fd(p, nonblock) < 0)

                return (-1);
                return (-1);

-#ifdef HAVE_DAG_STREAMS_API
-       {
-               uint32_t mindata;
-               struct timeval maxwait;
-               struct timeval poll;

 
 

-               if (dag_get_stream_poll(p->fd, pd->dag_stream,
-                                       &mindata, &maxwait, &poll) < 0) {
-                       pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "dag_get_stream_poll: %s", pcap_strerror(errno));
-                       return -1;
-               }
+       if (dag_get_stream_poll64(p->fd, pd->dag_stream,
+                               &mindata, &maxwait, &poll) < 0) {
+               pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "dag_get_stream_poll");
+               return -1;
+       }

 
 

-               /* Amount of data to collect in Bytes before calling callbacks.
-                * Important for efficiency, but can introduce latency
-                * at low packet rates if to_ms not set!
-                */
-               if(nonblock)
-                       mindata = 0;
-               else
-                       mindata = 65536;
-
-               if (dag_set_stream_poll(p->fd, pd->dag_stream,
-                                       mindata, &maxwait, &poll) < 0) {
-                       pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "dag_set_stream_poll: %s", pcap_strerror(errno));
-                       return -1;
-               }
+       /* Amount of data to collect in Bytes before calling callbacks.
+        * Important for efficiency, but can introduce latency
+        * at low packet rates if to_ms not set!
+        */
+       if(nonblock)
+               mindata = 0;
+       else
+               mindata = 65536;
+
+       if (dag_set_stream_poll64(p->fd, pd->dag_stream,
+                               mindata, &maxwait, &poll) < 0) {
+               pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "dag_set_stream_poll");
+               return -1;

        }
        }

-#endif /* HAVE_DAG_STREAMS_API */
+

        if (nonblock) {
        if (nonblock) {

-               pd->dag_offset_flags |= DAGF_NONBLOCK;
+               pd->dag_flags |= DAGF_NONBLOCK;

        } else {
        } else {

-               pd->dag_offset_flags &= ~DAGF_NONBLOCK;
+               pd->dag_flags &= ~DAGF_NONBLOCK;

        }
        return (0);
 }
        }
        return (0);
 }


@@ -1224,7 +1277,8 @@ dag_get_datalink(pcap_t *p)
        memset(types, 0, 255);
 
        if (p->dlt_list == NULL && (p->dlt_list = malloc(255*sizeof(*(p->dlt_list)))) == NULL) {
        memset(types, 0, 255);
 
        if (p->dlt_list == NULL && (p->dlt_list = malloc(255*sizeof(*(p->dlt_list)))) == NULL) {

-               (void)pcap_snprintf(p->errbuf, sizeof(p->errbuf), "malloc: %s", pcap_strerror(errno));
+               pcap_fmt_errmsg_for_errno(p->errbuf, sizeof(p->errbuf),
+                   errno, "malloc");

                return (-1);
        }
 
                return (-1);
        }
 


@@ -1233,7 +1287,8 @@ dag_get_datalink(pcap_t *p)
 #ifdef HAVE_DAG_GET_STREAM_ERF_TYPES
        /* Get list of possible ERF types for this card */
        if (dag_get_stream_erf_types(p->fd, pd->dag_stream, types, 255) < 0) {
 #ifdef HAVE_DAG_GET_STREAM_ERF_TYPES
        /* Get list of possible ERF types for this card */
        if (dag_get_stream_erf_types(p->fd, pd->dag_stream, types, 255) < 0) {

-               pcap_snprintf(p->errbuf, sizeof(p->errbuf), "dag_get_stream_erf_types: %s", pcap_strerror(errno));
+               pcap_fmt_errmsg_for_errno(p->errbuf, sizeof(p->errbuf),
+                   errno, "dag_get_stream_erf_types");

                return (-1);
        }
 
                return (-1);
        }
 


@@ -1242,7 +1297,8 @@ dag_get_datalink(pcap_t *p)
 #elif defined HAVE_DAG_GET_ERF_TYPES
        /* Get list of possible ERF types for this card */
        if (dag_get_erf_types(p->fd, types, 255) < 0) {
 #elif defined HAVE_DAG_GET_ERF_TYPES
        /* Get list of possible ERF types for this card */
        if (dag_get_erf_types(p->fd, types, 255) < 0) {

-               pcap_snprintf(p->errbuf, sizeof(p->errbuf), "dag_get_erf_types: %s", pcap_strerror(errno));
+               pcap_fmt_errmsg_for_errno(p->errbuf, sizeof(p->errbuf),
+                   errno, "dag_get_erf_types");

                return (-1);
        }
 
                return (-1);
        }
 


@@ -1255,10 +1311,10 @@ dag_get_datalink(pcap_t *p)
 #endif
                switch((types[index] & 0x7f)) {
 
 #endif
                switch((types[index] & 0x7f)) {
 

-               case TYPE_HDLC_POS:
-               case TYPE_COLOR_HDLC_POS:
-               case TYPE_DSM_COLOR_HDLC_POS:
-               case TYPE_COLOR_HASH_POS:
+               case ERF_TYPE_HDLC_POS:
+               case ERF_TYPE_COLOR_HDLC_POS:
+               case ERF_TYPE_DSM_COLOR_HDLC_POS:
+               case ERF_TYPE_COLOR_HASH_POS:

 
                        if (p->dlt_list != NULL) {
                                p->dlt_list[dlt_index++] = DLT_CHDLC;
 
                        if (p->dlt_list != NULL) {
                                p->dlt_list[dlt_index++] = DLT_CHDLC;


@@ -1269,10 +1325,10 @@ dag_get_datalink(pcap_t *p)
                                p->linktype = DLT_CHDLC;
                        break;
 
                                p->linktype = DLT_CHDLC;
                        break;
 

-               case TYPE_ETH:
-               case TYPE_COLOR_ETH:
-               case TYPE_DSM_COLOR_ETH:
-               case TYPE_COLOR_HASH_ETH:
+               case ERF_TYPE_ETH:
+               case ERF_TYPE_COLOR_ETH:
+               case ERF_TYPE_DSM_COLOR_ETH:
+               case ERF_TYPE_COLOR_HASH_ETH:

                        /*
                         * This is (presumably) a real Ethernet capture; give it a
                         * link-layer-type list with DLT_EN10MB and DLT_DOCSIS, so
                        /*
                         * This is (presumably) a real Ethernet capture; give it a
                         * link-layer-type list with DLT_EN10MB and DLT_DOCSIS, so


@@ -1291,10 +1347,10 @@ dag_get_datalink(pcap_t *p)
                                p->linktype = DLT_EN10MB;
                        break;
 
                                p->linktype = DLT_EN10MB;
                        break;
 

-               case TYPE_ATM:
-               case TYPE_AAL5:
-               case TYPE_MC_ATM:
-               case TYPE_MC_AAL5:
+               case ERF_TYPE_ATM:
+               case ERF_TYPE_AAL5:
+               case ERF_TYPE_MC_ATM:
+               case ERF_TYPE_MC_AAL5:

                        if (p->dlt_list != NULL) {
                                p->dlt_list[dlt_index++] = DLT_ATM_RFC1483;
                                p->dlt_list[dlt_index++] = DLT_SUNATM;
                        if (p->dlt_list != NULL) {
                                p->dlt_list[dlt_index++] = DLT_ATM_RFC1483;
                                p->dlt_list[dlt_index++] = DLT_SUNATM;


@@ -1303,8 +1359,8 @@ dag_get_datalink(pcap_t *p)
                                p->linktype = DLT_ATM_RFC1483;
                        break;
 
                                p->linktype = DLT_ATM_RFC1483;
                        break;
 

-               case TYPE_COLOR_MC_HDLC_POS:
-               case TYPE_MC_HDLC:
+               case ERF_TYPE_COLOR_MC_HDLC_POS:
+               case ERF_TYPE_MC_HDLC:

                        if (p->dlt_list != NULL) {
                                p->dlt_list[dlt_index++] = DLT_CHDLC;
                                p->dlt_list[dlt_index++] = DLT_PPP_SERIAL;
                        if (p->dlt_list != NULL) {
                                p->dlt_list[dlt_index++] = DLT_CHDLC;
                                p->dlt_list[dlt_index++] = DLT_PPP_SERIAL;


@@ -1317,20 +1373,33 @@ dag_get_datalink(pcap_t *p)
                                p->linktype = DLT_CHDLC;
                        break;
 
                                p->linktype = DLT_CHDLC;
                        break;
 

-               case TYPE_IPV4:
-               case TYPE_IPV6:
+               case ERF_TYPE_IPV4:
+                       if (p->dlt_list != NULL) {
+                               p->dlt_list[dlt_index++] = DLT_RAW;
+                               p->dlt_list[dlt_index++] = DLT_IPV4;
+                       }
+                       if(!p->linktype)
+                               p->linktype = DLT_RAW;
+                       break;
+
+               case ERF_TYPE_IPV6:
+                       if (p->dlt_list != NULL) {
+                               p->dlt_list[dlt_index++] = DLT_RAW;
+                               p->dlt_list[dlt_index++] = DLT_IPV6;
+                       }

                        if(!p->linktype)
                                p->linktype = DLT_RAW;
                        break;
 
                        if(!p->linktype)
                                p->linktype = DLT_RAW;
                        break;
 

-               case TYPE_LEGACY:
-               case TYPE_MC_RAW:
-               case TYPE_MC_RAW_CHANNEL:
-               case TYPE_IP_COUNTER:
-               case TYPE_TCP_FLOW_COUNTER:
-               case TYPE_INFINIBAND:
-               case TYPE_RAW_LINK:
-               case TYPE_INFINIBAND_LINK:
+               case ERF_TYPE_LEGACY:
+               case ERF_TYPE_MC_RAW:
+               case ERF_TYPE_MC_RAW_CHANNEL:
+               case ERF_TYPE_IP_COUNTER:
+               case ERF_TYPE_TCP_FLOW_COUNTER:
+               case ERF_TYPE_INFINIBAND:
+               case ERF_TYPE_RAW_LINK:
+               case ERF_TYPE_INFINIBAND_LINK:
+               case ERF_TYPE_META:

                default:
                        /* Libpcap cannot deal with these types yet */
                        /* Add no 'native' DLTs, but still covered by DLT_ERF */
                default:
                        /* Libpcap cannot deal with these types yet */
                        /* Add no 'native' DLTs, but still covered by DLT_ERF */


@@ -1360,9 +1429,8 @@ dag_get_datalink(pcap_t *p)
  * There are no regular interfaces, just DAG interfaces.
  */
 int
  * There are no regular interfaces, just DAG interfaces.
  */
 int

-pcap_platform_finddevs(pcap_if_t **alldevsp, char *errbuf)
+pcap_platform_finddevs(pcap_if_list_t *devlistp _U_, char *errbuf)

 {
 {

-       *alldevsp = NULL;

        return (0);
 }
 
        return (0);
 }
 


@@ -1372,8 +1440,17 @@ pcap_platform_finddevs(pcap_if_t **alldevsp, char *errbuf)
 pcap_t *
 pcap_create_interface(const char *device, char *errbuf)
 {
 pcap_t *
 pcap_create_interface(const char *device, char *errbuf)
 {

-       pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+       snprintf(errbuf, PCAP_ERRBUF_SIZE,

            "This version of libpcap only supports DAG cards");
        return NULL;
 }
            "This version of libpcap only supports DAG cards");
        return NULL;
 }

+
+/*
+ * Libpcap version string.
+ */
+const char *
+pcap_lib_version(void)
+{
+       return (PCAP_VERSION_STRING " (DAG-only)");
+}

 #endif
 #endif