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 ae9c7abd7027acf6dc28b2c618b97d614f84bbe3..f261ead00df8a0c3bdcbe47206d03b180b883f94 100644 (file)
--- a/pcap-dag.c
+++ b/pcap-dag.c
@@ -1,27 +1,14 @@
 /*
 /*

- * pcap-dag.c: Packet capture interface for Endace DAG card.
- *
- * 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)
  *
  * Authors: Richard Littin, Sean Irvine ({richard,sean}@reeltwo.com)

- * Modifications: Jesper Peterson  <[email protected]>
- *                Koryn Grant      <[email protected]>
- *                Stephen Donnelly <support@endace.com>
+ * Modifications: Jesper Peterson
+ *                Koryn Grant
+ *                Stephen Donnelly <stephen.donnelly@endace.com>

  */
 
  */
 

-#ifndef lint
-static const char rcsid[] _U_ =
-       "@(#) $Header: /tcpdump/master/libpcap/pcap-dag.c,v 1.27 2007-01-29 20:08:06 guy Exp $ (LBL)";
-#endif
-

 #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 */


@@ -32,7 +19,6 @@ static const char rcsid[] _U_ =
 
 #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>


@@ -45,10 +31,132 @@ struct rtentry;            /* declarations in <net/if.h> */
 
 #include "dagnew.h"
 #include "dagapi.h"
 
 #include "dagnew.h"
 #include "dagapi.h"

+#include "dagpci.h"
+#include "dag_config_api.h"
+
+#include "pcap-dag.h"
+
+/*
+ * DAG devices have names beginning with "dag", followed by a number
+ * from 0 to DAG_MAX_BOARDS, then optionally a colon and a stream number
+ * from 0 to DAG_STREAM_MAX.
+ */
+#ifndef DAG_MAX_BOARDS
+#define DAG_MAX_BOARDS 32
+#endif
+
+
+#ifndef ERF_TYPE_AAL5
+#define ERF_TYPE_AAL5               4
+#endif
+
+#ifndef ERF_TYPE_MC_HDLC
+#define ERF_TYPE_MC_HDLC            5
+#endif
+
+#ifndef ERF_TYPE_MC_RAW
+#define ERF_TYPE_MC_RAW             6
+#endif
+
+#ifndef ERF_TYPE_MC_ATM
+#define ERF_TYPE_MC_ATM             7
+#endif
+
+#ifndef ERF_TYPE_MC_RAW_CHANNEL
+#define ERF_TYPE_MC_RAW_CHANNEL     8
+#endif
+
+#ifndef ERF_TYPE_MC_AAL5
+#define ERF_TYPE_MC_AAL5            9
+#endif
+
+#ifndef ERF_TYPE_COLOR_HDLC_POS
+#define ERF_TYPE_COLOR_HDLC_POS     10
+#endif
+
+#ifndef ERF_TYPE_COLOR_ETH
+#define ERF_TYPE_COLOR_ETH          11
+#endif
+
+#ifndef ERF_TYPE_MC_AAL2
+#define ERF_TYPE_MC_AAL2            12
+#endif
+
+#ifndef ERF_TYPE_IP_COUNTER
+#define ERF_TYPE_IP_COUNTER         13
+#endif
+
+#ifndef ERF_TYPE_TCP_FLOW_COUNTER
+#define ERF_TYPE_TCP_FLOW_COUNTER   14
+#endif
+
+#ifndef ERF_TYPE_DSM_COLOR_HDLC_POS
+#define ERF_TYPE_DSM_COLOR_HDLC_POS 15
+#endif
+
+#ifndef ERF_TYPE_DSM_COLOR_ETH
+#define ERF_TYPE_DSM_COLOR_ETH      16
+#endif
+
+#ifndef ERF_TYPE_COLOR_MC_HDLC_POS
+#define ERF_TYPE_COLOR_MC_HDLC_POS  17
+#endif
+
+#ifndef ERF_TYPE_AAL2
+#define ERF_TYPE_AAL2               18
+#endif
+
+#ifndef ERF_TYPE_COLOR_HASH_POS
+#define ERF_TYPE_COLOR_HASH_POS     19
+#endif
+
+#ifndef ERF_TYPE_COLOR_HASH_ETH
+#define ERF_TYPE_COLOR_HASH_ETH     20
+#endif
+
+#ifndef ERF_TYPE_INFINIBAND
+#define ERF_TYPE_INFINIBAND         21
+#endif
+
+#ifndef ERF_TYPE_IPV4
+#define ERF_TYPE_IPV4               22
+#endif
+
+#ifndef ERF_TYPE_IPV6
+#define ERF_TYPE_IPV6               23
+#endif
+
+#ifndef ERF_TYPE_RAW_LINK
+#define ERF_TYPE_RAW_LINK           24
+#endif
+
+#ifndef ERF_TYPE_INFINIBAND_LINK
+#define ERF_TYPE_INFINIBAND_LINK    25
+#endif
+
+#ifndef ERF_TYPE_META
+#define ERF_TYPE_META               27
+#endif
+
+#ifndef ERF_TYPE_PAD
+#define ERF_TYPE_PAD                48
+#endif

 
 #define ATM_CELL_SIZE          52
 #define ATM_HDR_SIZE           4
 
 
 #define ATM_CELL_SIZE          52
 #define ATM_HDR_SIZE           4
 

+/*
+ * A header containing additional MTP information.
+ */
+#define MTP2_SENT_OFFSET               0       /* 1 byte */
+#define MTP2_ANNEX_A_USED_OFFSET       1       /* 1 byte */
+#define MTP2_LINK_NUMBER_OFFSET                2       /* 2 bytes */
+#define MTP2_HDR_LEN                   4       /* length of the header */
+
+#define MTP2_ANNEX_A_NOT_USED      0
+#define MTP2_ANNEX_A_USED          1
+#define MTP2_ANNEX_A_USED_UNKNOWN  2
+

 /* SunATM pseudo header */
 struct sunatm_hdr {
        unsigned char   flags;          /* destination and traffic type */
 /* SunATM pseudo header */
 struct sunatm_hdr {
        unsigned char   flags;          /* destination and traffic type */


@@ -56,6 +164,26 @@ struct sunatm_hdr {
        unsigned short  vci;            /* VCI */
 };
 
        unsigned short  vci;            /* VCI */
 };
 

+/*
+ * Private data for capturing on DAG devices.
+ */
+struct pcap_dag {
+       struct pcap_stat stat;
+       u_char  *dag_mem_bottom;        /* DAG card current memory bottom pointer */
+       u_char  *dag_mem_top;   /* DAG card current memory top pointer */
+       int     dag_fcs_bits;   /* Number of checksum bits from link layer */
+       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? */
+       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 {
        struct pcap_dag_node *next;
        pcap_t *p;
 typedef struct pcap_dag_node {
        struct pcap_dag_node *next;
        pcap_t *p;


@@ -68,24 +196,24 @@ static const unsigned short endian_test_word = 0x0100;
 
 #define IS_BIGENDIAN() (*((unsigned char *)&endian_test_word))
 
 
 #define IS_BIGENDIAN() (*((unsigned char *)&endian_test_word))
 

+#define MAX_DAG_PACKET 65536

 
 

-#ifdef DAG_ONLY
-/* This code is required when compiling for a DAG device only. */
-#include "pcap-dag.h"
+static unsigned char TempPkt[MAX_DAG_PACKET];

 
 

-/* Replace dag function names with pcap equivalent. */
-#define dag_open_live pcap_open_live
-#define dag_platform_finddevs pcap_platform_finddevs
-#endif /* DAG_ONLY */
+#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_setfilter(pcap_t *p, struct bpf_program *fp);

 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;
 


@@ -108,28 +236,30 @@ delete_pcap_dag(pcap_t *p)
  */
 
 static void
  */
 
 static void

-dag_platform_close(pcap_t *p)
+dag_platform_cleanup(pcap_t *p)

 {
 {

-       
-       if (p != NULL) {
-#ifdef HAVE_DAG_STREAMS_API
-               if(dag_stop_stream(p->fd, p->md.dag_stream) < 0)
-                       fprintf(stderr,"dag_stop_stream: %s\n", strerror(errno));
-               
-               if(dag_detach_stream(p->fd, p->md.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(dag_close(p->fd) < 0)
-                       fprintf(stderr,"dag_close: %s\n", strerror(errno));
-#ifdef linux           
-               free(p->md.device);
-#endif
+       struct pcap_dag *pd = p->priv;
+
+       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(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;
+               pd->dag_ref = NULL;

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

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

 }
 
 static void
 }
 
 static void


@@ -137,7 +267,8 @@ atexit_handler(void)
 {
        while (pcap_dags != NULL) {
                if (pcap_dags->pid == getpid()) {
 {
        while (pcap_dags != NULL) {
                if (pcap_dags->pid == getpid()) {

-                       dag_platform_close(pcap_dags->p);
+                       if (pcap_dags->p != NULL)
+                               dag_platform_cleanup(pcap_dags->p);

                } else {
                        delete_pcap_dag(pcap_dags->p);
                }
                } else {
                        delete_pcap_dag(pcap_dags->p);
                }


@@ -167,21 +298,55 @@ new_pcap_dag(pcap_t *p)
        return 0;
 }
 
        return 0;
 }
 

+static unsigned int
+dag_erf_ext_header_count(const uint8_t *erf, size_t len)
+{
+       uint32_t hdr_num = 0;
+       uint8_t  hdr_type;
+
+       /* basic sanity checks */
+       if ( erf == NULL )
+               return 0;
+       if ( len < 16 )
+               return 0;
+
+       /* check if we have any extension headers */
+       if ( (erf[8] & 0x80) == 0x00 )
+               return 0;
+
+       /* loop over the extension headers */
+       do {
+
+               /* sanity check we have enough bytes */
+               if ( len < (24 + (hdr_num * 8)) )
+                       return hdr_num;
+
+               /* get the header type */
+               hdr_type = erf[(16 + (hdr_num * 8))];
+               hdr_num++;
+
+       } while ( hdr_type & 0x80 );
+
+       return hdr_num;
+}
+

 /*
  *  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)
 {
  */
 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;
        unsigned int processed = 0;

-       int flags = p->md.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;

 
        /* Get the next bufferful of packets (if necessary). */
 
        /* Get the next bufferful of packets (if necessary). */

-       while (p->md.dag_mem_top - p->md.dag_mem_bottom < dag_record_size) {
- 
+       while (pd->dag_mem_top - pd->dag_mem_bottom < dag_record_size) {
+

                /*
                 * Has "pcap_breakloop()" been called?
                 */
                /*
                 * Has "pcap_breakloop()" been called?
                 */


@@ -195,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.


@@ -207,44 +371,43 @@ dag_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
                 * If non-block is specified it will return immediately. The user
                 * is then responsible for efficiency.
                 */
                 * If non-block is specified it will return immediately. The user
                 * is then responsible for efficiency.
                 */

-               p->md.dag_mem_top = dag_advance_stream(p->fd, p->md.dag_stream, &(p->md.dag_mem_bottom));
-#else
-               /* dag_offset does not support timeouts */
-               p->md.dag_mem_top = dag_offset(p->fd, &(p->md.dag_mem_bottom), flags);
-#endif /* HAVE_DAG_STREAMS_API */
+               if ( NULL == (pd->dag_mem_top = dag_advance_stream(p->fd, pd->dag_stream, &(pd->dag_mem_bottom))) ) {
+                    return -1;
+               }

 
 

-               if (nonblocking && (p->md.dag_mem_top - p->md.dag_mem_bottom < dag_record_size))
+               if (nonblocking && (pd->dag_mem_top - pd->dag_mem_bottom < dag_record_size))

                {
                        /* Pcap is configured to process only available packets, and there aren't any, return immediately. */
                        return 0;
                }
                {
                        /* Pcap is configured to process only available packets, and there aren't any, return immediately. */
                        return 0;
                }

-               
+

                if(!nonblocking &&
                if(!nonblocking &&

-                  p->md.dag_timeout &&
-                  (p->md.dag_mem_top - p->md.dag_mem_bottom < dag_record_size))
+                  pd->dag_timeout &&
+                  (pd->dag_mem_top - pd->dag_mem_bottom < dag_record_size))

                {
                        /* Blocking mode, but timeout set and no data has arrived, return anyway.*/
                        return 0;
                }
 
        }
                {
                        /* Blocking mode, but timeout set and no data has arrived, return anyway.*/
                        return 0;
                }
 
        }

-       
-       /* Process the packets. */
-       while (p->md.dag_mem_top - p->md.dag_mem_bottom >= dag_record_size) {
+
+       /*
+        * 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;
 
 
                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 *)(p->md.dag_mem_bottom);
-#else
-               dag_record_t *header = (dag_record_t *)(p->md.dag_mem_base + p->md.dag_mem_bottom);
-#endif /* HAVE_DAG_STREAMS_API */
+               dag_record_t *header = (dag_record_t *)(pd->dag_mem_bottom);

 
 

-               u_char *dp = ((u_char *)header) + dag_record_size;
+               u_char *dp = ((u_char *)header); /* + dag_record_size; */

                unsigned short rlen;
                unsigned short rlen;

- 
+

                /*
                 * Has "pcap_breakloop()" been called?
                 */
                /*
                 * Has "pcap_breakloop()" been called?
                 */


@@ -257,180 +420,297 @@ dag_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
                        p->break_loop = 0;
                        return -2;
                }
                        p->break_loop = 0;
                        return -2;
                }

- 
+

                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;
                }
                        return -1;
                }

-               p->md.dag_mem_bottom += rlen;
+               pd->dag_mem_bottom += rlen;

 
 

-               switch(header->type) {
-               case TYPE_ATM:
-#ifdef TYPE_AAL5
-               case TYPE_AAL5:
-                       if (header->type == TYPE_AAL5) {
-                               packet_len = ntohs(header->wlen);
-                               caplen = rlen - dag_record_size;
-                       }
-#endif
-#ifdef TYPE_MC_ATM
-               case TYPE_MC_ATM:
-                       if (header->type == TYPE_MC_ATM) {
-                               caplen = packet_len = ATM_CELL_SIZE;
-                               dp+=4;
-                       }
-#endif
-#ifdef TYPE_MC_AAL5
-               case TYPE_MC_AAL5:
-                       if (header->type == TYPE_MC_AAL5) {
-                               packet_len = ntohs(header->wlen);
-                               caplen = rlen - dag_record_size - 4;
-                               dp+=4;
-                       }
-#endif
-                       if (header->type == TYPE_ATM) {
-                               caplen = packet_len = ATM_CELL_SIZE;
-                       }
-                       if (p->linktype == DLT_SUNATM) {
-                               struct sunatm_hdr *sunatm = (struct sunatm_hdr *)dp;
-                               unsigned long rawatm;
-                                       
-                               rawatm = ntohl(*((unsigned long *)dp));
-                               sunatm->vci = htons((rawatm >>  4) & 0xffff);
-                               sunatm->vpi = (rawatm >> 20) & 0x00ff;
-                               sunatm->flags = ((header->flags.iface & 1) ? 0x80 : 0x00) | 
-                                       ((sunatm->vpi == 0 && sunatm->vci == htons(5)) ? 6 :
-                                        ((sunatm->vpi == 0 && sunatm->vci == htons(16)) ? 5 : 
-                                         ((dp[ATM_HDR_SIZE] == 0xaa &&
-                                           dp[ATM_HDR_SIZE+1] == 0xaa &&
-                                           dp[ATM_HDR_SIZE+2] == 0x03) ? 2 : 1)));
-
-                       } else {
-                               packet_len -= ATM_HDR_SIZE;
-                               caplen -= ATM_HDR_SIZE;
-                               dp += ATM_HDR_SIZE;
-                       }
+               /* Count lost packets. */
+               switch((header->type & 0x7f)) {
+                       /* in these types the color value overwrites the lctr */
+               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;
 
                        break;
 

-#ifdef TYPE_DSM_COLOR_ETH
-               case TYPE_DSM_COLOR_ETH:
-#endif
-#ifdef TYPE_COLOR_ETH
-               case TYPE_COLOR_ETH:
-#endif
-               case TYPE_ETH:
-                       packet_len = ntohs(header->wlen);
-                       packet_len -= (p->md.dag_fcs_bits >> 3);
-                       caplen = rlen - dag_record_size - 2;
-                       if (caplen > packet_len) {
-                               caplen = packet_len;
-                       }
-                       dp += 2;
-                       break;
-#ifdef TYPE_DSM_COLOR_HDLC_POS
-               case TYPE_DSM_COLOR_HDLC_POS:
-#endif
-#ifdef TYPE_COLOR_HDLC_POS
-               case TYPE_COLOR_HDLC_POS:
-#endif
-               case TYPE_HDLC_POS:
-                       packet_len = ntohs(header->wlen);
-                       packet_len -= (p->md.dag_fcs_bits >> 3);
-                       caplen = rlen - dag_record_size;
-                       if (caplen > packet_len) {
-                               caplen = packet_len;
+               default:
+                       if ( (pd->drop_attr == kNullAttributeUuid) && (header->lctr) ) {
+                               pd->stat.ps_drop += ntohs(header->lctr);

                        }
                        }

-                       break;
-#ifdef TYPE_MC_HDLC
-               case TYPE_MC_HDLC:
-                       packet_len = ntohs(header->wlen);
-                       packet_len -= (p->md.dag_fcs_bits >> 3);
-                       caplen = rlen - dag_record_size - 4;
+               }
+
+               if ((header->type & 0x7f) == ERF_TYPE_PAD) {
+                       continue;
+               }
+
+               num_ext_hdr = dag_erf_ext_header_count(dp, rlen);
+
+               /* ERF encapsulation */
+               /* The Extensible Record Format is not dropped for this kind of encapsulation,
+                * and will be handled as a pseudo header by the decoding application.
+                * The information carried in the ERF header and in the optional subheader (if present)
+                * could be merged with the libpcap information, to offer a better decoding.
+                * The packet length is
+                * o the length of the packet on the link (header->wlen),
+                * o plus the length of the ERF header (dag_record_size), as the length of the
+                *   pseudo header will be adjusted during the decoding,
+                * o plus the length of the optional subheader (if present).
+                *
+                * The capture length is header.rlen and the byte stuffing for alignment will be dropped
+                * if the capture length is greater than the packet length.
+                */
+               if (p->linktype == DLT_ERF) {
+                       packet_len = ntohs(header->wlen) + dag_record_size;
+                       caplen = rlen;
+                       switch ((header->type & 0x7f)) {
+                       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;
+
+                       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 */
+
+                       /* Include ERF extension headers */
+                       packet_len += (8 * num_ext_hdr);
+

                        if (caplen > packet_len) {
                                caplen = packet_len;
                        }
                        if (caplen > packet_len) {
                                caplen = packet_len;
                        }

-                       dp += 4;
-                       break;
-#endif
-               default:
-                       /* Unhandled ERF type.
-                        * Ignore rather than generating error
-                        */
-                       continue;
-               }
- 
-               if (caplen > p->snapshot)
-                       caplen = p->snapshot;
+               } else {
+                       /* Other kind of encapsulation according to the header Type */
+
+                       /* Skip over generic ERF header */
+                       dp += dag_record_size;
+                       /* Skip over extension headers */
+                       dp += 8 * num_ext_hdr;
+
+                       switch((header->type & 0x7f)) {
+                       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;
+                               }
+                       case ERF_TYPE_MC_ATM:
+                               if ((header->type & 0x7f) == ERF_TYPE_MC_ATM) {
+                                       caplen = packet_len = ATM_CELL_SIZE;
+                                       dp+=4;
+                               }
+                       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;
+                               }
+                               /* Skip over extension headers */
+                               caplen -= (8 * num_ext_hdr);

 
 

-               /* Count lost packets. */
-               switch(header->type) {
-#ifdef TYPE_COLOR_HDLC_POS
-                       /* in this type the color value overwrites the lctr */
-               case TYPE_COLOR_HDLC_POS:
-                       break;
-#endif
-#ifdef TYPE_COLOR_ETH
-                       /* in this type the color value overwrites the lctr */
-               case TYPE_COLOR_ETH:
-                       break;
-#endif
-#ifdef TYPE_DSM_COLOR_HDLC_POS
-                       /* in this type the color value overwrites the lctr */
-               case TYPE_DSM_COLOR_HDLC_POS:
-                       break;
-#endif
-#ifdef TYPE_DSM_COLOR_ETH
-                       /* in this type the color value overwrites the lctr */
-               case TYPE_DSM_COLOR_ETH:
-                       break;
+                               if ((header->type & 0x7f) == ERF_TYPE_ATM) {
+                                       caplen = packet_len = ATM_CELL_SIZE;
+                               }
+                               if (p->linktype == DLT_SUNATM) {
+                                       struct sunatm_hdr *sunatm = (struct sunatm_hdr *)dp;
+                                       unsigned long rawatm;
+
+                                       rawatm = ntohl(*((unsigned long *)dp));
+                                       sunatm->vci = htons((rawatm >>  4) & 0xffff);
+                                       sunatm->vpi = (rawatm >> 20) & 0x00ff;
+                                       sunatm->flags = ((header->flags.iface & 1) ? 0x80 : 0x00) |
+                                               ((sunatm->vpi == 0 && sunatm->vci == htons(5)) ? 6 :
+                                                ((sunatm->vpi == 0 && sunatm->vci == htons(16)) ? 5 :
+                                                 ((dp[ATM_HDR_SIZE] == 0xaa &&
+                                                   dp[ATM_HDR_SIZE+1] == 0xaa &&
+                                                   dp[ATM_HDR_SIZE+2] == 0x03) ? 2 : 1)));
+
+                               } else if (p->linktype == DLT_ATM_RFC1483) {
+                                       packet_len -= ATM_HDR_SIZE;
+                                       caplen -= ATM_HDR_SIZE;
+                                       dp += ATM_HDR_SIZE;
+                               } else
+                                       continue;
+                               break;
+
+                       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;
+                               /* Skip over extension headers */
+                               caplen -= (8 * num_ext_hdr);
+                               if (caplen > packet_len) {
+                                       caplen = packet_len;
+                               }
+                               dp += 2;
+                               break;
+
+                       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;
+                               /* Skip over extension headers */
+                               caplen -= (8 * num_ext_hdr);
+                               if (caplen > packet_len) {
+                                       caplen = packet_len;
+                               }
+                               break;
+
+                       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;
+                               /* Skip over extension headers */
+                               caplen -= (8 * num_ext_hdr);
+                               if (caplen > packet_len) {
+                                       caplen = packet_len;
+                               }
+                               /* jump the MC_HDLC_HEADER */
+                               dp += 4;
+#ifdef DLT_MTP2_WITH_PHDR
+                               if (p->linktype == DLT_MTP2_WITH_PHDR) {
+                                       /* Add the MTP2 Pseudo Header */
+                                       caplen += MTP2_HDR_LEN;
+                                       packet_len += MTP2_HDR_LEN;
+
+                                       TempPkt[MTP2_SENT_OFFSET] = 0;
+                                       TempPkt[MTP2_ANNEX_A_USED_OFFSET] = MTP2_ANNEX_A_USED_UNKNOWN;
+                                       *(TempPkt+MTP2_LINK_NUMBER_OFFSET) = ((header->rec.mc_hdlc.mc_header>>16)&0x01);
+                                       *(TempPkt+MTP2_LINK_NUMBER_OFFSET+1) = ((header->rec.mc_hdlc.mc_header>>24)&0xff);
+                                       memcpy(TempPkt+MTP2_HDR_LEN, dp, caplen);
+                                       dp = TempPkt;
+                               }

 #endif
 #endif

+                               break;

 
 

-               default:
-                       if (header->lctr) {
-                               if (p->md.stat.ps_drop > (UINT_MAX - ntohs(header->lctr))) {
-                                       p->md.stat.ps_drop = UINT_MAX;
-                               } else {
-                                       p->md.stat.ps_drop += ntohs(header->lctr);
+                       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 */
+                               caplen -= (8 * num_ext_hdr);
+                               if (caplen > packet_len) {
+                                       caplen = packet_len;
+                               }
+                               break;
+
+                       /* These types have no matching 'native' DLT, but can be used with DLT_ERF above */
+                       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
+                                */
+                               continue;
+                       } /* switch type */
+
+               } /* ERF encapsulation */
+
+               if (caplen > p->snapshot)
+                       caplen = p->snapshot;

 
                /* Run the packet filter if there is one. */
 
                /* 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;

-                               
+

                        if (IS_BIGENDIAN()) {
                                ts = SWAPLL(header->ts);
                        } else {
                                ts = header->ts;
                        }
 
                        if (IS_BIGENDIAN()) {
                                ts = SWAPLL(header->ts);
                        } else {
                                ts = header->ts;
                        }
 

+                       switch (p->opt.tstamp_precision) {
+                       case PCAP_TSTAMP_PRECISION_NANO:
+                               ticks_per_second = 1000000000;
+                               break;
+                       case PCAP_TSTAMP_PRECISION_MICRO:
+                       default:
+                               ticks_per_second = 1000000;
+                               break;
+
+                       }

                        pcap_header.ts.tv_sec = ts >> 32;
                        pcap_header.ts.tv_sec = ts >> 32;

-                       ts = (ts & 0xffffffffULL) * 1000000;
+                       ts = (ts & 0xffffffffULL) * ticks_per_second;

                        ts += 0x80000000; /* rounding */
                        ts += 0x80000000; /* rounding */

-                       pcap_header.ts.tv_usec = ts >> 32;              
-                       if (pcap_header.ts.tv_usec >= 1000000) {
-                               pcap_header.ts.tv_usec -= 1000000;
+                       pcap_header.ts.tv_usec = ts >> 32;
+                       if (pcap_header.ts.tv_usec >= ticks_per_second) {
+                               pcap_header.ts.tv_usec -= ticks_per_second;

                                pcap_header.ts.tv_sec++;
                        }
 
                        /* Fill in our own header data */
                        pcap_header.caplen = caplen;
                        pcap_header.len = packet_len;
                                pcap_header.ts.tv_sec++;
                        }
 
                        /* Fill in our own header data */
                        pcap_header.caplen = caplen;
                        pcap_header.len = packet_len;

-       
+

                        /* Count the packet. */
                        /* Count the packet. */

-                       p->md.stat.ps_recv++;
-       
+                       pd->stat.ps_recv++;
+

                        /* Call the user supplied callback function */
                        callback(user, &pcap_header, dp);
                        /* Call the user supplied callback function */
                        callback(user, &pcap_header, dp);

-       
+

                        /* Only count packets that pass the filter, for consistency with standard Linux behaviour. */
                        processed++;
                        /* Only count packets that pass the filter, for consistency with standard Linux behaviour. */
                        processed++;

-                       if (processed == cnt)
+                       if (processed == cnt && !PACKET_COUNT_IS_UNLIMITED(cnt))

                        {
                                /* Reached the user-specified limit. */
                                return cnt;
                        {
                                /* Reached the user-specified limit. */
                                return cnt;


@@ -442,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);
 }


@@ -452,124 +732,169 @@ dag_inject(pcap_t *p, const void *buf _U_, size_t size _U_)
 /*
  *  Get a handle for a live capture from the given DAG device.  Passing a NULL
  *  device will result in a failure.  The promisc flag is ignored because DAG
 /*
  *  Get a handle for a live capture from the given DAG device.  Passing a NULL
  *  device will result in a failure.  The promisc flag is ignored because DAG

- *  cards are always promiscuous.  The to_ms parameter is also ignored as it is
- *  not supported in hardware.
- *  
+ *  cards are always promiscuous.  The to_ms parameter is used in setting the
+ *  API polling parameters.
+ *

  *  snaplen is now also ignored, until we get per-stream slen support. Set
  *  snaplen is now also ignored, until we get per-stream slen support. Set

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

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

-pcap_t *
-dag_open_live(const char *device, int snaplen, int promisc, int to_ms, char *ebuf)
+static int dag_activate(pcap_t* p)

 {
 {

-       char conf[30]; /* dag configure string */
-       pcap_t *handle;
+       struct pcap_dag *pd = p->priv;

        char *s;
        int n;
        daginf_t* daginf;
        char *s;
        int n;
        daginf_t* daginf;

-       char * newDev;
-#ifdef HAVE_DAG_STREAMS_API
-       uint32_t mindata;
+       char * newDev = NULL;
+       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) {

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

        }
        }

-       /* Allocate a handle for this session. */

 
 

-       handle = malloc(sizeof(*handle));
-       if (handle == NULL) {
-               snprintf(ebuf, PCAP_ERRBUF_SIZE, "malloc %s: %s", device, pcap_strerror(errno));
-               return NULL;
-       }
-       

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

-       
-       memset(handle, 0, sizeof(*handle));
-

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

+       if (newDev == NULL) {
+               ret = PCAP_ERROR;
+               pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "Can't allocate string for device name");
+               goto fail;
+       }

 
 

-#ifdef HAVE_DAG_STREAMS_API
-       

        /* Parse input name to get dag device and stream number if provided */
        /* Parse input name to get dag device and stream number if provided */

-       if (dag_parse_name(device, newDev, strlen(device) + 16, &handle->md.dag_stream) < 0) {
-               snprintf(ebuf, PCAP_ERRBUF_SIZE, "dag_parse_name: %s\n", 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 (handle->md.dag_stream%2) {
-               snprintf(ebuf, PCAP_ERRBUF_SIZE, "dag_parse_name: tx (even numbered) streams not supported for capture\n");
+       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 (strstr(device, "/dev") == NULL) {
-               newDev[0] = '\0';
-               strcat(newDev, "/dev/");
-               strcat(newDev,device);
-               device = newDev;
-       } else {
-               device = strdup(device);
-       }

 
 

-       if (device == NULL) {
-               snprintf(ebuf, PCAP_ERRBUF_SIZE, "str_dup: %s\n", pcap_strerror(errno));
+       /* setup device parameters */
+       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;
        }

-#endif /* HAVE_DAG_STREAMS_API */

 
 

-       /* setup device parameters */
-       if((handle->fd = dag_open((char *)device)) < 0) {
-               snprintf(ebuf, PCAP_ERRBUF_SIZE, "dag_open %s: %s", device, pcap_strerror(errno));
-               goto fail;
+       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;

        }
 
        }
 

-#ifdef HAVE_DAG_STREAMS_API

        /* 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, handle->md.dag_stream, 0, 0) < 0) {
-               snprintf(ebuf, PCAP_ERRBUF_SIZE, "dag_attach_stream: %s\n", pcap_strerror(errno));
-               goto fail;
+       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;
+       }
+
+       /* 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, handle->md.dag_stream,
+       if (dag_get_stream_poll64(p->fd, pd->dag_stream,

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

-               snprintf(ebuf, PCAP_ERRBUF_SIZE, "dag_get_stream_poll: %s\n", pcap_strerror(errno));
-               goto fail;
+               ret = PCAP_ERROR;
+               pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "dag_get_stream_poll");
+               goto faildetach;

        }
        }

-       
-       /* 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!
+
+       /* 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.

         */
         */

-       mindata = 65536;
+       if (p->snapshot <= 0 || p->snapshot > MAXIMUM_SNAPLEN)
+               p->snapshot = MAXIMUM_SNAPLEN;

 
 

-       /* Obey to_ms if supplied. This is a good idea!
+       if (p->opt.immediate) {
+               /* Call callback immediately.
+                * XXX - is this the right way to p this?
+                */
+               mindata = 0;
+       } else {
+               /* 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!
+                */
+               mindata = 65536;
+       }
+
+       /* 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.
         */
         * Recommend 10-100ms. Calls will time out even if no data arrived.
         */

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

 
 

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

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

-               snprintf(ebuf, PCAP_ERRBUF_SIZE, "dag_set_stream_poll: %s\n", pcap_strerror(errno));
-               goto fail;
-       }
-               
-#else
-       if((handle->md.dag_mem_base = dag_mmap(handle->fd)) == MAP_FAILED) {
-               snprintf(ebuf, PCAP_ERRBUF_SIZE,"dag_mmap %s: %s\n", device, pcap_strerror(errno));
-               goto fail;
+               ret = PCAP_ERROR;
+               pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "dag_set_stream_poll");
+               goto faildetach;

        }
 
        }
 

-#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


@@ -578,195 +903,311 @@ dag_open_live(const char *device, int snaplen, int promisc, int to_ms, char *ebu
        /* 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 (snaplen == 0 || snaplen > MAX_DAG_SNAPLEN) {
-               snaplen = 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) {

-               snaplen = 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 */

-       snprintf(conf, 30, "varlen slen=%d", (snaplen + 3) & ~3); 
+#endif

 
 

-       if(dag_configure(handle->fd, conf) < 0) {
-               snprintf(ebuf, PCAP_ERRBUF_SIZE,"dag_configure %s: %s\n", device, pcap_strerror(errno));
-               goto fail;
-       }
-#endif 
-       
-#ifdef HAVE_DAG_STREAMS_API
-       if(dag_start_stream(handle->fd, handle->md.dag_stream) < 0) {
-               snprintf(ebuf, PCAP_ERRBUF_SIZE, "dag_start_stream %s: %s\n", device, pcap_strerror(errno));
-               goto fail;
-       }
-#else
-       if(dag_start(handle->fd) < 0) {
-               snprintf(ebuf, PCAP_ERRBUF_SIZE, "dag_start %s: %s\n", device, pcap_strerror(errno));
-               goto fail;
+       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;

        }
        }

-#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!
         */

-       handle->md.dag_mem_bottom = 0;
-       handle->md.dag_mem_top = 0;
-       handle->md.dag_fcs_bits = 32;
+       pd->dag_mem_bottom = 0;
+       pd->dag_mem_top = 0;

 
 

-       /* Query the card first for special cases. */
-       daginf = dag_info(handle->fd);
-       if ((0x4200 == daginf->device_code) || (0x4230 == daginf->device_code))
-       {
+       /*
+        * Find out how many FCS bits we should strip.
+        * First, query the card to see if it strips the FCS.
+        */
+       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. */
                /* DAG 4.2S and 4.23S already strip the FCS.  Stripping the final word again truncates the packet. */

-               handle->md.dag_fcs_bits = 0;
-       }
+               pd->dag_fcs_bits = 0;

 
 

-       /* Then allow an environment variable to override. */
-       if ((s = getenv("ERF_FCS_BITS")) != NULL) {
-               if ((n = atoi(s)) == 0 || n == 16|| n == 32) {
-                       handle->md.dag_fcs_bits = n;
-               } else {
-                       snprintf(ebuf, PCAP_ERRBUF_SIZE,
-                               "pcap_open_live %s: bad ERF_FCS_BITS value (%d) in environment\n", device, n);
-                       goto fail;
+               /* Note that no FCS will be supplied. */
+               p->linktype_ext = LT_FCS_DATALINK_EXT(0);
+       } else {
+               /*
+                * Start out assuming it's 32 bits.
+                */
+               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) {
+                               pd->dag_fcs_bits = n;
+                       } else {
+                               ret = PCAP_ERROR;
+                               snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+                                       "pcap_activate %s: bad ERF_FCS_BITS value (%d) in environment", device, n);
+                               goto failstop;
+                       }
+               }
+
+               /*
+                * Did the user request that they not be stripped?
+                */
+               if ((s = getenv("ERF_DONT_STRIP_FCS")) != NULL) {
+                       /* Yes.  Note the number of 16-bit words that will be
+                          supplied. */
+                       p->linktype_ext = LT_FCS_DATALINK_EXT(pd->dag_fcs_bits/16);
+
+                       /* And don't strip them. */
+                       pd->dag_fcs_bits = 0;

                }
        }
 
                }
        }
 

-       handle->snapshot        = snaplen;
-       handle->md.dag_timeout  = to_ms;
+       pd->dag_timeout = p->opt.timeout;

 
 

-       handle->linktype = -1;
-       if (dag_get_datalink(handle) < 0) {
-               strcpy(ebuf, handle->errbuf);
-               goto fail;
+       p->linktype = -1;
+       if (dag_get_datalink(p) < 0) {
+               ret = PCAP_ERROR;
+               goto failstop;

        }
        }

-       
-       handle->bufsize = 0;

 
 

-       if (new_pcap_dag(handle) < 0) {
-               snprintf(ebuf, PCAP_ERRBUF_SIZE, "new_pcap_dag %s: %s\n", device, pcap_strerror(errno));
-               goto fail;
+       p->bufsize = 0;
+
+       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.
         */
        }
 
        /*
         * "select()" and "poll()" don't work on DAG device descriptors.
         */

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

 
 

-#ifdef linux
-       handle->md.device = (char *)device;
-       handle->md.timeout = to_ms;
-#else
-       free((char *)device);
-       device = NULL;
-#endif
+       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->close_op = dag_platform_close;
-       handle->md.stat.ps_drop = 0;
-       handle->md.stat.ps_recv = 0;
-       return handle;
+       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;
+
+failstop:
+       if (dag_stop_stream(p->fd, pd->dag_stream) < 0) {
+               fprintf(stderr,"dag_stop_stream: %s\n", strerror(errno));
+       }
+
+faildetach:
+       if (dag_detach_stream(p->fd, pd->dag_stream) < 0)
+               fprintf(stderr,"dag_detach_stream: %s\n", strerror(errno));
+
+failclose:
+       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(p);

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

-       if (handle != NULL) {
-               /*
-                * Get rid of any link-layer type list we allocated.
-                */
-               if (handle->dlt_list != NULL) {
-                       free(handle->dlt_list);
-               }
-               free(handle);
+
+       return ret;
+}
+
+pcap_t *dag_create(const char *device, char *ebuf, int *is_ours)
+{
+       const char *cp;
+       char *cpend;
+       long devnum;
+       pcap_t *p;
+       long stream = 0;
+
+       /* Does this look like a DAG device? */
+       cp = strrchr(device, '/');
+       if (cp == NULL)
+               cp = device;
+       /* Does it begin with "dag"? */
+       if (strncmp(cp, "dag", 3) != 0) {
+               /* Nope, doesn't begin with "dag" */
+               *is_ours = 0;
+               return NULL;
+       }
+       /* Yes - is "dag" followed by a number from 0 to DAG_MAX_BOARDS-1 */
+       cp += 3;
+       devnum = strtol(cp, &cpend, 10);
+       if (*cpend == ':') {
+               /* Followed by a stream number. */
+               stream = strtol(++cpend, &cpend, 10);

        }
 
        }
 

-       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 (stream <0 || stream >= DAG_STREAM_MAX) {
+               /* Followed by a non-valid stream number. */
+               *is_ours = 0;
+               return NULL;
+       }
+
+       /* OK, it's probably ours. */
+       *is_ours = 1;
+
+       p = PCAP_CREATE_COMMON(ebuf, struct pcap_dag);
+       if (p == NULL)
+               return NULL;
+
+       p->activate_op = dag_activate;
+
+       /*
+        * We claim that we support microsecond and nanosecond time
+        * stamps.
+        *
+        * 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_list = malloc(2 * sizeof(u_int));
+       if (p->tstamp_precision_list == NULL) {
+               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;
+       p->tstamp_precision_count = 2;
+       return p;

 }
 
 static int
 dag_stats(pcap_t *p, struct pcap_stat *ps) {
 }
 
 static int
 dag_stats(pcap_t *p, struct pcap_stat *ps) {

-       /* This needs to be filled out correctly.  Hopefully a dagapi call will
-                provide all necessary information.
-       */
-       /*p->md.stat.ps_recv = 0;*/
-       /*p->md.stat.ps_drop = 0;*/
-       
-       *ps = p->md.stat;
- 
+       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).
+        */
+
+       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;
+

        return 0;
 }
 
 /*
        return 0;
 }
 
 /*

- * Simply submit all possible dag names as candidates.
- * pcap_add_if() internally tests each candidate with pcap_open_live(),
- * so any non-existent devices are dropped.
- * For 2.5 try all rx stream names as well.
+ * Add all DAG devices.

  */
 int
  */
 int

-dag_platform_finddevs(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;
        int c;

-
-       /* Try all the DAGs 0-9 */
-       for (c = 0; c < 9; 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++) {

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

-               if (pcap_add_if(devlistp, name, 0, NULL, errbuf) == -1) {
+               if (-1 == dag_parse_name(name, dagname, DAGNAME_BUFSIZE, &dagstream))
+               {
+                       (void) snprintf(errbuf, PCAP_ERRBUF_SIZE,
+                           "dag: device name %s can't be parsed", name);
+                       return (-1);
+               }
+               if ( (dagfd = dag_open(dagname)) >= 0 ) {
+                       description = NULL;
+                       if ((inf = dag_pciinfo(dagfd)))
+                               description = dag_device_name(inf->device_code, 1);

                        /*
                        /*

-                        * Failure.
+                        * 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"?

                         */
                         */

-                       ret = -1;
-               }
-#ifdef HAVE_DAG_STREAMS_API
-               {
-                       int stream;
-                       for(stream=0;stream<16;stream+=2) {
-                               snprintf(name,  10, "dag%d:%d", c, stream);
-                               if (pcap_add_if(devlistp, name, 0, NULL, errbuf) == -1) {
-                                       /*
-                                        * Failure.
-                                        */
-                                       ret = -1;
+                       if (add_dev(devlistp, name, 0, description, errbuf) == NULL) {
+                               /*
+                                * Failure.
+                                */
+                               return (-1);
+                       }
+                       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;
+                                       }

                                }
                                }

-                       }                               
+                       }
+                       dag_close(dagfd);

                }
                }

-#endif  /* HAVE_DAG_STREAMS_API */
-       }
-       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;
-
-       p->md.use_bpf = 0;
-

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


@@ -779,74 +1220,88 @@ 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;
+       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

-        * "p->md.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, p->md.dag_stream,
-                                       &mindata, &maxwait, &poll) < 0) {
-                       snprintf(errbuf, PCAP_ERRBUF_SIZE, "dag_get_stream_poll: %s\n", 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_poll(p->fd, p->md.dag_stream,
-                                       mindata, &maxwait, &poll) < 0) {
-                       snprintf(errbuf, PCAP_ERRBUF_SIZE, "dag_set_stream_poll: %s\n", 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;

        }
        }

-#endif /* HAVE_DAG_STREAMS_API */
+
+       /* 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;
+       }
+

        if (nonblock) {
        if (nonblock) {

-               p->md.dag_offset_flags |= DAGF_NONBLOCK;
+               pd->dag_flags |= DAGF_NONBLOCK;

        } else {
        } else {

-               p->md.dag_offset_flags &= ~DAGF_NONBLOCK;
+               pd->dag_flags &= ~DAGF_NONBLOCK;

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

-               
+

 static int
 dag_get_datalink(pcap_t *p)
 {
 static int
 dag_get_datalink(pcap_t *p)
 {

-       int index=0;
+       struct pcap_dag *pd = p->priv;
+       int index=0, dlt_index=0;

        uint8_t types[255];
 
        memset(types, 0, 255);
 
        if (p->dlt_list == NULL && (p->dlt_list = malloc(255*sizeof(*(p->dlt_list)))) == NULL) {
        uint8_t types[255];
 
        memset(types, 0, 255);
 
        if (p->dlt_list == NULL && (p->dlt_list = malloc(255*sizeof(*(p->dlt_list)))) == NULL) {

-               (void)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);
        }
 
        p->linktype = 0;
 
                return (-1);
        }
 
        p->linktype = 0;
 

-#ifdef HAVE_DAG_GET_ERF_TYPES
+#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_fmt_errmsg_for_errno(p->errbuf, sizeof(p->errbuf),
+                   errno, "dag_get_stream_erf_types");
+               return (-1);
+       }
+
+       while (types[index]) {
+
+#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) {
        /* Get list of possible ERF types for this card */
        if (dag_get_erf_types(p->fd, types, 255) < 0) {

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

        }
        }

-       
+

        while (types[index]) {
 #else
        /* Check the type through a dagapi call. */
        while (types[index]) {
 #else
        /* Check the type through a dagapi call. */


@@ -854,31 +1309,26 @@ dag_get_datalink(pcap_t *p)
 
        {
 #endif
 
        {
 #endif

-               switch(types[index]) {
+               switch((types[index] & 0x7f)) {
+
+               case ERF_TYPE_HDLC_POS:
+               case ERF_TYPE_COLOR_HDLC_POS:
+               case ERF_TYPE_DSM_COLOR_HDLC_POS:
+               case ERF_TYPE_COLOR_HASH_POS:

 
 

-               case TYPE_HDLC_POS:
-#ifdef TYPE_COLOR_HDLC_POS
-               case TYPE_COLOR_HDLC_POS:
-#endif
-#ifdef TYPE_DSM_COLOR_HDLC_POS
-               case TYPE_DSM_COLOR_HDLC_POS:
-#endif

                        if (p->dlt_list != NULL) {
                        if (p->dlt_list != NULL) {

-                               p->dlt_list[index++] = DLT_CHDLC;
-                               p->dlt_list[index++] = DLT_PPP_SERIAL;
-                               p->dlt_list[index++] = DLT_FRELAY;
+                               p->dlt_list[dlt_index++] = DLT_CHDLC;
+                               p->dlt_list[dlt_index++] = DLT_PPP_SERIAL;
+                               p->dlt_list[dlt_index++] = DLT_FRELAY;

                        }
                        if(!p->linktype)
                                p->linktype = DLT_CHDLC;
                        break;
 
                        }
                        if(!p->linktype)
                                p->linktype = DLT_CHDLC;
                        break;
 

-               case TYPE_ETH:
-#ifdef TYPE_COLOR_ETH
-               case TYPE_COLOR_ETH:
-#endif
-#ifdef TYPE_DSM_COLOR_ETH
-               case TYPE_DSM_COLOR_ETH:
-#endif
+               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


@@ -890,57 +1340,117 @@ dag_get_datalink(pcap_t *p)
                         * Ethernet framing).
                         */
                        if (p->dlt_list != NULL) {
                         * Ethernet framing).
                         */
                        if (p->dlt_list != NULL) {

-                               p->dlt_list[index++] = DLT_EN10MB;
-                               p->dlt_list[index++] = DLT_DOCSIS;
+                               p->dlt_list[dlt_index++] = DLT_EN10MB;
+                               p->dlt_list[dlt_index++] = DLT_DOCSIS;

                        }
                        if(!p->linktype)
                                p->linktype = DLT_EN10MB;
                        break;
 
                        }
                        if(!p->linktype)
                                p->linktype = DLT_EN10MB;
                        break;
 

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

                        if (p->dlt_list != NULL) {
                        if (p->dlt_list != NULL) {

-                               p->dlt_list[index++] = DLT_ATM_RFC1483;
-                               p->dlt_list[index++] = DLT_SUNATM;
+                               p->dlt_list[dlt_index++] = DLT_ATM_RFC1483;
+                               p->dlt_list[dlt_index++] = DLT_SUNATM;

                        }
                        if(!p->linktype)
                                p->linktype = DLT_ATM_RFC1483;
                        break;
 
                        }
                        if(!p->linktype)
                                p->linktype = DLT_ATM_RFC1483;
                        break;
 

-#ifdef TYPE_MC_HDLC
-               case TYPE_MC_HDLC:
+               case ERF_TYPE_COLOR_MC_HDLC_POS:
+               case ERF_TYPE_MC_HDLC:

                        if (p->dlt_list != NULL) {
                        if (p->dlt_list != NULL) {

-                               p->dlt_list[index++] = DLT_CHDLC;
-                               p->dlt_list[index++] = DLT_PPP_SERIAL;
-                               p->dlt_list[index++] = DLT_FRELAY;
-                               p->dlt_list[index++] = DLT_MTP2;
+                               p->dlt_list[dlt_index++] = DLT_CHDLC;
+                               p->dlt_list[dlt_index++] = DLT_PPP_SERIAL;
+                               p->dlt_list[dlt_index++] = DLT_FRELAY;
+                               p->dlt_list[dlt_index++] = DLT_MTP2;
+                               p->dlt_list[dlt_index++] = DLT_MTP2_WITH_PHDR;
+                               p->dlt_list[dlt_index++] = DLT_LAPD;

                        }
                        if(!p->linktype)
                                p->linktype = DLT_CHDLC;
                        break;
                        }
                        if(!p->linktype)
                                p->linktype = DLT_CHDLC;
                        break;

-#endif

 
 

-               case TYPE_LEGACY:
+               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)
                        if(!p->linktype)

-                               p->linktype = DLT_NULL;
+                               p->linktype = DLT_RAW;

                        break;
 
                        break;
 

+               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:
                default:

-                       snprintf(p->errbuf, sizeof(p->errbuf), "unknown DAG linktype %d", types[index]);
-                       return (-1);
+                       /* Libpcap cannot deal with these types yet */
+                       /* Add no 'native' DLTs, but still covered by DLT_ERF */
+                       break;

 
                } /* switch */
 
                } /* switch */

+               index++;

        }
 
        }
 

-       p->dlt_count = index;
+       p->dlt_list[dlt_index++] = DLT_ERF;
+
+       p->dlt_count = dlt_index;
+
+       if(!p->linktype)
+               p->linktype = DLT_ERF;

 
        return p->linktype;
 }
 
        return p->linktype;
 }

+
+#ifdef DAG_ONLY
+/*
+ * This libpcap build supports only DAG cards, not regular network
+ * interfaces.
+ */
+
+/*
+ * There are no regular interfaces, just DAG interfaces.
+ */
+int
+pcap_platform_finddevs(pcap_if_list_t *devlistp _U_, char *errbuf)
+{
+       return (0);
+}
+
+/*
+ * Attempts to open a regular interface fail.
+ */
+pcap_t *
+pcap_create_interface(const char *device, char *errbuf)
+{
+       snprintf(errbuf, PCAP_ERRBUF_SIZE,
+           "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