Merge pull request #538 from sfd/master

[libpcap] / pcap-dag.c

diff --git a/pcap-dag.c b/pcap-dag.c
index 03ba11af457bb17d4f4f39868bcd673bde405b27..ea1c09592c21fe275d58cff4adbffd6525552087 100644 (file)
--- a/pcap-dag.c
+++ b/pcap-dag.c
@@ -1,5 +1,5 @@
 /*
 /*

- * pcap-dag.c: Packet capture interface for Endace DAG card.
+ * 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
  *
  * 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


@@ -10,14 +10,11 @@
  * called as required from their pcap-linux/bpf equivalents.
  *
  * Authors: Richard Littin, Sean Irvine ({richard,sean}@reeltwo.com)
  * called as required from their pcap-linux/bpf equivalents.
  *
  * Authors: Richard Littin, Sean Irvine ({richard,sean}@reeltwo.com)

- * Modifications: Jesper Peterson, Koryn Grant <[email protected]>
+ * Modifications: Jesper Peterson
+ *                Koryn Grant
+ *                Stephen Donnelly <[email protected]>

  */
 
  */
 

-#ifndef lint
-static const char rcsid[] _U_ =
-       "@(#) $Header: /tcpdump/master/libpcap/pcap-dag.c,v 1.20 2005-01-21 10:11:39 guy Exp $ (LBL)";
-#endif
-

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif


@@ -43,12 +40,127 @@ struct rtentry;            /* declarations in <net/if.h> */
 
 #include "dagnew.h"
 #include "dagapi.h"
 
 #include "dagnew.h"
 #include "dagapi.h"

+#include "dagpci.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 TYPE_AAL5
+#define TYPE_AAL5               4
+#endif
+
+#ifndef TYPE_MC_HDLC
+#define TYPE_MC_HDLC            5
+#endif
+
+#ifndef TYPE_MC_RAW
+#define TYPE_MC_RAW             6
+#endif
+
+#ifndef TYPE_MC_ATM
+#define TYPE_MC_ATM             7
+#endif
+
+#ifndef TYPE_MC_RAW_CHANNEL
+#define TYPE_MC_RAW_CHANNEL     8
+#endif
+
+#ifndef TYPE_MC_AAL5
+#define TYPE_MC_AAL5            9
+#endif
+
+#ifndef TYPE_COLOR_HDLC_POS
+#define TYPE_COLOR_HDLC_POS     10
+#endif
+
+#ifndef TYPE_COLOR_ETH
+#define TYPE_COLOR_ETH          11
+#endif
+
+#ifndef TYPE_MC_AAL2
+#define TYPE_MC_AAL2            12
+#endif
+
+#ifndef TYPE_IP_COUNTER
+#define TYPE_IP_COUNTER         13
+#endif
+
+#ifndef TYPE_TCP_FLOW_COUNTER
+#define TYPE_TCP_FLOW_COUNTER   14
+#endif
+
+#ifndef TYPE_DSM_COLOR_HDLC_POS
+#define TYPE_DSM_COLOR_HDLC_POS 15
+#endif
+
+#ifndef TYPE_DSM_COLOR_ETH
+#define TYPE_DSM_COLOR_ETH      16
+#endif
+
+#ifndef TYPE_COLOR_MC_HDLC_POS
+#define TYPE_COLOR_MC_HDLC_POS  17
+#endif
+
+#ifndef TYPE_AAL2
+#define TYPE_AAL2               18
+#endif
+
+#ifndef TYPE_COLOR_HASH_POS
+#define TYPE_COLOR_HASH_POS     19
+#endif
+
+#ifndef TYPE_COLOR_HASH_ETH
+#define TYPE_COLOR_HASH_ETH     20
+#endif
+
+#ifndef TYPE_INFINIBAND
+#define TYPE_INFINIBAND         21
+#endif
+
+#ifndef TYPE_IPV4
+#define TYPE_IPV4               22
+#endif
+
+#ifndef TYPE_IPV6
+#define TYPE_IPV6               23
+#endif
+
+#ifndef TYPE_RAW_LINK
+#define TYPE_RAW_LINK           24
+#endif
+
+#ifndef TYPE_INFINIBAND_LINK
+#define TYPE_INFINIBAND_LINK    25
+#endif
+
+#ifndef TYPE_PAD
+#define TYPE_PAD                48
+#endif

 
 

-#define MIN_DAG_SNAPLEN                12
-#define MAX_DAG_SNAPLEN                2040

 #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 +168,27 @@ 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;
+#ifdef HAVE_DAG_STREAMS_API
+       u_char  *dag_mem_bottom;        /* DAG card current memory bottom pointer */
+       u_char  *dag_mem_top;   /* DAG card current memory top pointer */
+#else /* 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_offset_flags; /* Flags to pass to dag_offset(). */
+       int     dag_stream;     /* DAG stream number */
+       int     dag_timeout;    /* timeout specified to pcap_open_live.
+                                * Same as in linux above, introduce
+                                * generally? */
+};
+

 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,28 +201,9 @@ static const unsigned short endian_test_word = 0x0100;
 
 #define IS_BIGENDIAN() (*((unsigned char *)&endian_test_word))
 
 
 #define IS_BIGENDIAN() (*((unsigned char *)&endian_test_word))
 

-/*
- * Swap byte ordering of unsigned long long timestamp on a big endian
- * machine.
- */
-#define SWAP_TS(ull)  ((ull & 0xff00000000000000LL) >> 56) | \
-                      ((ull & 0x00ff000000000000LL) >> 40) | \
-                      ((ull & 0x0000ff0000000000LL) >> 24) | \
-                      ((ull & 0x000000ff00000000LL) >> 8)  | \
-                      ((ull & 0x00000000ff000000LL) << 8)  | \
-                      ((ull & 0x0000000000ff0000LL) << 24) | \
-                      ((ull & 0x000000000000ff00LL) << 40) | \
-                      ((ull & 0x00000000000000ffLL) << 56)
-
-
-#ifdef DAG_ONLY
-/* This code is required when compiling for a DAG device only. */
-#include "pcap-dag.h"
+#define MAX_DAG_PACKET 65536

 
 

-/* Replace dag function names with pcap equivalent. */
-#define dag_open_live pcap_open_live
-#define dag_platform_finddevs pcap_platform_finddevs
-#endif /* DAG_ONLY */
+static unsigned char TempPkt[MAX_DAG_PACKET];

 
 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_setfilter(pcap_t *p, struct bpf_program *fp);
 static int dag_stats(pcap_t *p, struct pcap_stat *ps);


@@ -121,27 +235,27 @@ delete_pcap_dag(pcap_t *p)
  */
 
 static void
  */
 
 static void

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

 {
 {

+       struct pcap_dag *pd = p->priv;

 
 

-#ifdef linux
-       if (p != NULL && p->md.device != NULL) {
-               if(dag_stop(p->fd) < 0)
-                       fprintf(stderr,"dag_stop %s: %s\n", p->md.device, strerror(errno));
-               if(dag_close(p->fd) < 0)
-                       fprintf(stderr,"dag_close %s: %s\n", p->md.device, strerror(errno));
-               
-               free(p->md.device);
-       }
+#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));

 #else
 #else

-       if (p != NULL) {
-               if(dag_stop(p->fd) < 0)
-                       fprintf(stderr,"dag_stop: %s\n", strerror(errno));
+       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(dag_close(p->fd) < 0)
                        fprintf(stderr,"dag_close: %s\n", strerror(errno));

+               p->fd = -1;

        }
        }

-#endif

        delete_pcap_dag(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. */
 }
 
        /* Note: don't need to call close(p->fd) here as dag_close(p->fd) does this. */
 }
 


@@ -150,7 +264,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);
                }


@@ -180,6 +295,38 @@ new_pcap_dag(pcap_t *p)
        return 0;
 }
 
        return 0;
 }
 

+static unsigned int
+dag_erf_ext_header_count(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


@@ -188,90 +335,217 @@ new_pcap_dag(pcap_t *p)
 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;
+       int flags = pd->dag_offset_flags;

        unsigned int nonblocking = flags & DAGF_NONBLOCK;
        unsigned int nonblocking = flags & DAGF_NONBLOCK;

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

 
 

-       for (;;)
-       {
-               /* Get the next bufferful of packets (if necessary). */
-               while (p->md.dag_mem_top - p->md.dag_mem_bottom < dag_record_size) {
- 
+       /* Get the next bufferful of packets (if necessary). */
+       while (pd->dag_mem_top - pd->dag_mem_bottom < dag_record_size) {
+
+               /*
+                * Has "pcap_breakloop()" been called?
+                */
+               if (p->break_loop) {

                        /*
                        /*

-                        * Has "pcap_breakloop()" been called?
+                        * Yes - clear the flag that indicates that
+                        * it has, and return -2 to indicate that
+                        * we were told to break out of the loop.

                         */
                         */

-                       if (p->break_loop) {
-                               /*
-                                * Yes - clear the flag that indicates that
-                                * it has, and return -2 to indicate that
-                                * we were told to break out of the loop.
-                                */
-                               p->break_loop = 0;
-                               return -2;
-                       }
+                       p->break_loop = 0;
+                       return -2;
+               }

 
 

-                       p->md.dag_mem_top = dag_offset(p->fd, &(p->md.dag_mem_bottom), flags);
-                       if (nonblocking && (p->md.dag_mem_top - p->md.dag_mem_bottom < dag_record_size))
-                       {
-                               /* Pcap is configured to process only available packets, and there aren't any. */
-                               return 0;
-                       }
+#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.
+                * We wait for 64kB because processing a few packets at a time
+                * can cause problems at high packet rates (>200kpps) due
+                * to inefficiencies.
+                * This does mean if to_ms is not specified the capture may 'hang'
+                * for long periods if the data rate is extremely slow (<64kB/sec)
+                * If non-block is specified it will return immediately. The user
+                * is then responsible for efficiency.
+                */
+               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))
+               {
+                       /* Pcap is configured to process only available packets, and there aren't any, return immediately. */
+                       return 0;
+               }
+
+               if(!nonblocking &&
+                  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;

                }
                }

-       
-               /* Process the packets. */
-               while (p->md.dag_mem_top - p->md.dag_mem_bottom >= dag_record_size) {
-
-                       unsigned short packet_len = 0;
-                       int caplen = 0;
-                       struct pcap_pkthdr      pcap_header;
-
-                       dag_record_t *header = (dag_record_t *)(p->md.dag_mem_base + p->md.dag_mem_bottom);
-                       u_char *dp = ((u_char *)header) + dag_record_size;
-                       unsigned short rlen;
- 
+
+       }
+
+       /* Process the packets. */
+       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);
+#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;
+
+               /*
+                * Has "pcap_breakloop()" been called?
+                */
+               if (p->break_loop) {

                        /*
                        /*

-                        * Has "pcap_breakloop()" been called?
+                        * Yes - clear the flag that indicates that
+                        * it has, and return -2 to indicate that
+                        * we were told to break out of the loop.

                         */
                         */

-                       if (p->break_loop) {
-                               /*
-                                * Yes - clear the flag that indicates that
-                                * it has, and return -2 to indicate that
-                                * we were told to break out of the loop.
-                                */
-                               p->break_loop = 0;
-                               return -2;
+                       p->break_loop = 0;
+                       return -2;
+               }
+
+               rlen = ntohs(header->rlen);
+               if (rlen < dag_record_size)
+               {
+                       strncpy(p->errbuf, "dag_read: record too small", PCAP_ERRBUF_SIZE);
+                       return -1;
+               }
+               pd->dag_mem_bottom += rlen;
+
+               /* 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:
+                       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);
+                               }

                        }
                        }

- 
-                               rlen = ntohs(header->rlen);
-                       if (rlen < dag_record_size)
-                       {
-                               strncpy(p->errbuf, "dag_read: record too small", PCAP_ERRBUF_SIZE);
-                               return -1;
+               }
+
+               if ((header->type & 0x7f) == 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 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:
+                               packet_len += 4; /* MC header */
+                               break;
+
+                       case TYPE_COLOR_HASH_ETH:
+                       case TYPE_DSM_COLOR_ETH:
+                       case TYPE_COLOR_ETH:
+                       case 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;

                        }
                        }

-                       p->md.dag_mem_bottom += rlen;
+               } else {
+                       /* Other kind of encapsulation according to the header Type */

 
 

-                       switch(header->type) {
-                       case TYPE_AAL5:
+                       /* Skip over generic ERF header */
+                       dp += dag_record_size;
+                       /* Skip over extension headers */
+                       dp += 8 * num_ext_hdr;
+
+                       switch((header->type & 0x7f)) {

                        case TYPE_ATM:
                        case TYPE_ATM:

+                       case TYPE_AAL5:

                                if (header->type == TYPE_AAL5) {
                                if (header->type == TYPE_AAL5) {

-                                               packet_len = ntohs(header->wlen);
+                                       packet_len = ntohs(header->wlen);

                                        caplen = rlen - dag_record_size;
                                        caplen = rlen - dag_record_size;

-                               } else {
+                               }
+                       case TYPE_MC_ATM:
+                               if (header->type == TYPE_MC_ATM) {
+                                       caplen = packet_len = ATM_CELL_SIZE;
+                                       dp+=4;
+                               }
+                       case TYPE_MC_AAL5:
+                               if (header->type == 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);
+
+                               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;
                                        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);
+
+                                       rawatm = ntohl(*((unsigned long *)dp));
+                                       sunatm->vci = htons((rawatm >>  4) & 0xffff);

                                        sunatm->vpi = (rawatm >> 20) & 0x00ff;
                                        sunatm->vpi = (rawatm >> 20) & 0x00ff;

-                                       sunatm->flags = ((header->flags.iface & 1) ? 0x80 : 0x00) | 
+                                       sunatm->flags = ((header->flags.iface & 1) ? 0x80 : 0x00) |

                                                ((sunatm->vpi == 0 && sunatm->vci == htons(5)) ? 6 :
                                                ((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)));
+                                                ((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;
 
                                } else {
                                        packet_len -= ATM_HDR_SIZE;


@@ -280,85 +554,145 @@ dag_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
                                }
                                break;
 
                                }
                                break;
 

+                       case TYPE_COLOR_HASH_ETH:
+                       case TYPE_DSM_COLOR_ETH:
+                       case TYPE_COLOR_ETH:

                        case TYPE_ETH:
                        case TYPE_ETH:

-                                       packet_len = ntohs(header->wlen);
-                               packet_len -= (p->md.dag_fcs_bits >> 3);
+                               packet_len = ntohs(header->wlen);
+                               packet_len -= (pd->dag_fcs_bits >> 3);

                                caplen = rlen - dag_record_size - 2;
                                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;
 
                                if (caplen > packet_len) {
                                        caplen = packet_len;
                                }
                                dp += 2;
                                break;
 

+                       case TYPE_COLOR_HASH_POS:
+                       case TYPE_DSM_COLOR_HDLC_POS:
+                       case TYPE_COLOR_HDLC_POS:

                        case TYPE_HDLC_POS:
                        case TYPE_HDLC_POS:

-                                       packet_len = ntohs(header->wlen);
-                               packet_len -= (p->md.dag_fcs_bits >> 3);
+                               packet_len = ntohs(header->wlen);
+                               packet_len -= (pd->dag_fcs_bits >> 3);

                                caplen = rlen - dag_record_size;
                                caplen = rlen - dag_record_size;

+                               /* Skip over extension headers */
+                               caplen -= (8 * num_ext_hdr);

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

-                       }
- 
-                       if (caplen > p->snapshot)
-                               caplen = p->snapshot;

 
 

-                       /* Count lost packets. */
-                       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 TYPE_COLOR_MC_HDLC_POS:
+                       case TYPE_MC_HDLC:
+                               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;

                                }
                                }

-                       }
-
-                       /* Run the packet filter if there is one. */
-                       if ((p->fcode.bf_insns == NULL) || bpf_filter(p->fcode.bf_insns, dp, packet_len, caplen)) {
-
-                               /* convert between timestamp formats */
-                               register unsigned long long ts;
-                               
-                               if (IS_BIGENDIAN()) {
-                                       ts = SWAP_TS(header->ts);
-                               } else {
-                                       ts = header->ts;
+                               /* 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
+                               break;

 
 

-                               pcap_header.ts.tv_sec = ts >> 32;
-                               ts = (ts & 0xffffffffULL) * 1000000;
-                               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_sec++;
+                       case TYPE_IPV4:
+                       case TYPE_IPV6:
+                               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;

 
 

-                               /* Fill in our own header data */
-                               pcap_header.caplen = caplen;
-                               pcap_header.len = packet_len;
-       
-                               /* Count the packet. */
-                               p->md.stat.ps_recv++;
-       
-                               /* 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++;
-                               if (processed == cnt)
-                               {
-                                       /* Reached the user-specified limit. */
-                                       return cnt;
-                               }
+                       /* 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:
+                       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. */
+               if ((p->fcode.bf_insns == NULL) || bpf_filter(p->fcode.bf_insns, dp, packet_len, caplen)) {
+
+                       /* convert between timestamp formats */
+                       register unsigned long long ts;
+
+                       if (IS_BIGENDIAN()) {
+                               ts = SWAPLL(header->ts);
+                       } else {
+                               ts = header->ts;

                        }
                        }

-               }

 
 

-               if (nonblocking || processed)
-               {
-                       return processed;
+                       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;
+                       ts = (ts & 0xffffffffULL) * ticks_per_second;
+                       ts += 0x80000000; /* rounding */
+                       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;
+
+                       /* Count the packet. */
+                       pd->stat.ps_recv++;
+
+                       /* 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++;
+                       if (processed == cnt && !PACKET_COUNT_IS_UNLIMITED(cnt))
+                       {
+                               /* Reached the user-specified limit. */
+                               return cnt;
+                       }

                }
        }
                }
        }

-       
+

        return processed;
 }
 
        return processed;
 }
 


@@ -373,270 +707,429 @@ 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
+ *  slen with approprite 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* handle)

 {
 {

+       struct pcap_dag *handlep = handle->priv;
+#if 0

        char conf[30]; /* dag configure string */
        char conf[30]; /* dag configure string */

-       pcap_t *handle;
+#endif

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

-       
+       char * newDev = NULL;
+       char * device = handle->opt.device;
+#ifdef HAVE_DAG_STREAMS_API
+       uint32_t mindata;
+       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;
+               pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "device is NULL: %s", pcap_strerror(errno));
+               return -1;

        }
        }

-       /* 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));
-
-       if (strstr(device, "/dev") == NULL) {
-               char * newDev = (char *)malloc(strlen(device) + 6);
-               newDev[0] = '\0';
-               strcat(newDev, "/dev/");
-               strcat(newDev,device);
-               device = newDev;
-       } else {
-               device = strdup(device);
+
+#ifdef HAVE_DAG_STREAMS_API
+       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));
+               goto fail;

        }
 
        }
 

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

                goto fail;
        }
                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");
+               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 */
        if((handle->fd = dag_open((char *)device)) < 0) {
 
        /* setup device parameters */
        if((handle->fd = dag_open((char *)device)) < 0) {

-               snprintf(ebuf, PCAP_ERRBUF_SIZE, "dag_open %s: %s", device, pcap_strerror(errno));
+               pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "dag_open %s: %s", device, pcap_strerror(errno));

                goto fail;
        }
 
                goto fail;
        }
 

+#ifdef HAVE_DAG_STREAMS_API
+       /* 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));
+               goto failclose;
+       }
+
+       /* Set up default poll parameters for stream
+        * Can be overridden by pcap_set_nonblock()
+        */
+       if (dag_get_stream_poll(handle->fd, handlep->dag_stream,
+                               &mindata, &maxwait, &poll) < 0) {
+               pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "dag_get_stream_poll: %s", pcap_strerror(errno));
+               goto faildetach;
+       }
+
+       if (handle->opt.immediate) {
+               /* Call callback immediately.
+                * XXX - is this the right way to handle 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.
+        */
+       maxwait.tv_sec = handle->opt.timeout/1000;
+       maxwait.tv_usec = (handle->opt.timeout%1000) * 1000;
+
+       if (dag_set_stream_poll(handle->fd, handlep->dag_stream,
+                               mindata, &maxwait, &poll) < 0) {
+               pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "dag_set_stream_poll: %s", pcap_strerror(errno));
+               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
+        * again via the Config API without side-effects */
+#if 0

        /* set the card snap length to the specified snaplen parameter */
        /* set the card snap length to the specified snaplen parameter */

-       if (snaplen == 0 || snaplen > MAX_DAG_SNAPLEN) {
-               snaplen = MAX_DAG_SNAPLEN;
+       /* 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;

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

-               snaplen = MIN_DAG_SNAPLEN;
+               handle->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); 
+       pcap_snprintf(conf, 30, "varlen slen=%d", (snaplen + 3) & ~3);

 
        if(dag_configure(handle->fd, conf) < 0) {
 
        if(dag_configure(handle->fd, conf) < 0) {

-               snprintf(ebuf, PCAP_ERRBUF_SIZE,"dag_configure %s: %s\n", device, pcap_strerror(errno));
-               goto fail;
+               pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,"dag_configure %s: %s", device, pcap_strerror(errno));
+               goto faildetach;

        }
        }

-       
-       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;
+#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));
+               goto faildetach;

        }
        }

-       
+#else

        if(dag_start(handle->fd) < 0) {
        if(dag_start(handle->fd) < 0) {

-               snprintf(ebuf, PCAP_ERRBUF_SIZE, "dag_start %s: %s\n", device, pcap_strerror(errno));
-               goto fail;
+               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!
         */

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

 
 

-       /* Query the card first for special cases. */
+       /*
+        * 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(handle->fd);

-       if ((0x4200 == daginf->device_code) || (0x4230 == daginf->device_code))
-       {
+       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;
-       }
+               handlep->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. */
+               handle->linktype_ext = LT_FCS_DATALINK_EXT(0);
+       } else {
+               /*
+                * Start out assuming it's 32 bits.
+                */
+               handlep->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) {
+                               handlep->dag_fcs_bits = n;
+                       } else {
+                               pcap_snprintf(handle->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 bytes that will be
+                          supplied. */
+                       handle->linktype_ext = LT_FCS_DATALINK_EXT(handlep->dag_fcs_bits/16);
+
+                       /* And don't strip them. */
+                       handlep->dag_fcs_bits = 0;

                }
        }
 
                }
        }
 

-       handle->snapshot        = snaplen;
-       /*handle->md.timeout    = to_ms; */
+       handlep->dag_timeout    = handle->opt.timeout;

 
        handle->linktype = -1;
 
        handle->linktype = -1;

-       if (dag_get_datalink(handle) < 0) {
-               strcpy(ebuf, handle->errbuf);
-               goto fail;
-       }
-       
+       if (dag_get_datalink(handle) < 0)
+               goto failstop;
+

        handle->bufsize = 0;
 
        if (new_pcap_dag(handle) < 0) {
        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;
+               pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "new_pcap_dag %s: %s", device, pcap_strerror(errno));
+               goto failstop;

        }
 
        /*
        }
 
        /*

-        * "select()" and "poll()" don't (yet) work on DAG device descriptors.
+        * "select()" and "poll()" don't work on DAG device descriptors.

         */
        handle->selectable_fd = -1;
 
         */
        handle->selectable_fd = -1;
 

-#ifdef linux
-       handle->md.device = (char *)device;
-#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->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->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->cleanup_op = dag_platform_cleanup;
+       handlep->stat.ps_drop = 0;
+       handlep->stat.ps_recv = 0;
+       handlep->stat.ps_ifdrop = 0;
+       return 0;
+
+#ifdef HAVE_DAG_STREAMS_API
+failstop:
+       if (dag_stop_stream(handle->fd, handlep->dag_stream) < 0) {
+               fprintf(stderr,"dag_stop_stream: %s\n", strerror(errno));
+       }

 
 

-       return handle;
+faildetach:
+       if (dag_detach_stream(handle->fd, handlep->dag_stream) < 0)
+               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:
+       if (dag_close(handle->fd) < 0)
+               fprintf(stderr,"dag_close: %s\n", strerror(errno));
+       delete_pcap_dag(handle);

 
 fail:
 
 fail:

-       if (device != NULL) {
-               free((char *)device);
+       pcap_cleanup_live_common(handle);
+       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 PCAP_ERROR;
+}
+
+pcap_t *dag_create(const char *device, char *ebuf, int *is_ours)
+{
+       const char *cp;
+       char *cpend;
+       long devnum;
+       pcap_t *p;
+#ifdef HAVE_DAG_STREAMS_API
+       long stream = 0;
+#endif
+
+       /* 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);
+#ifdef HAVE_DAG_STREAMS_API
+       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 (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;

        }
        }

+#endif

 
 

-       return NULL;
+       /* OK, it's probably ours. */
+       *is_ours = 1;
+
+       p = pcap_create_common(ebuf, sizeof (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_count = 2;
+       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_close(p);
+               return NULL;
+       }
+       p->tstamp_precision_list[0] = PCAP_TSTAMP_PRECISION_MICRO;
+       p->tstamp_precision_list[1] = PCAP_TSTAMP_PRECISION_NANO;
+       return p;

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

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

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

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

- * Get from "/proc/dag" all interfaces listed there; if they're
- * already in the list of interfaces we have, that won't add another
- * instance, but if they're not, that'll add them.
- *
- * We don't bother getting any addresses for them.
+ * 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.

  *
  *

- * We also don't fail if we couldn't open "/proc/dag"; we just leave
- * the list of interfaces as is.
+ * 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.

  */
 int
  */
 int

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

 {
 {

-       FILE *proc_dag_f;
-       char linebuf[512];
-       int linenum;
-       unsigned char *p;
-       char name[512]; /* XXX - pick a size */
-       char *q;
+       char name[12];  /* XXX - pick a size */

        int ret = 0;
        int ret = 0;

-
-       /* Quick exit if /proc/dag not readable */
-       proc_dag_f = fopen("/proc/dag", "r");
-       if (proc_dag_f == NULL)
-       {
-               int i;
-               char dev[16] = "dagx";
-
-               for (i = '0'; ret == 0 && i <= '9'; i++) {
-                       dev[3] = i;
-                       if (pcap_add_if(devlistp, dev, 0, NULL, errbuf) == -1) {
+       int c;
+       char dagname[DAGNAME_BUFSIZE];
+       int dagstream;
+       int dagfd;
+       dag_card_inf_t *inf;
+       char *description;
+
+       /* Try all the DAGs 0-DAG_MAX_BOARDS */
+       for (c = 0; c < DAG_MAX_BOARDS; c++) {
+               pcap_snprintf(name, 12, "dag%d", c);
+               if (-1 == dag_parse_name(name, dagname, DAGNAME_BUFSIZE, &dagstream))
+               {
+                       return -1;
+               }
+               description = NULL;
+               if ( (dagfd = dag_open(dagname)) >= 0 ) {
+                       if ((inf = dag_pciinfo(dagfd)))
+                               description = dag_device_name(inf->device_code, 1);
+                       if (pcap_add_if(devlistp, name, 0, description, errbuf) == -1) {

                                /*
                                 * Failure.
                                 */
                                ret = -1;
                        }
                                /*
                                 * Failure.
                                 */
                                ret = -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;
+                                               }
+                                       }
+                               }
+                       }
+#endif  /* HAVE_DAG_STREAMS_API */
+                       dag_close(dagfd);

                }
 
                }
 

-               return (ret);
-       }
-
-       for (linenum = 1; fgets(linebuf, sizeof linebuf, proc_dag_f) != NULL; linenum++) {
-               
-               /*
-                * Skip the first two lines - they're headers.
-                */
-               if (linenum <= 2)
-                       continue;
-
-               p = &linebuf[0];
-
-               if (*p == '\0' || *p == '\n' || *p != 'D')
-                       continue;  /* not a Dag line */
-
-               /*
-                * Get the interface name.
-                */
-               q = &name[0];
-               while (*p != '\0' && *p != ':') {
-                       if (*p != ' ')
-                               *q++ = tolower(*p++);
-                       else
-                               p++;
-               }
-               *q = '\0';
-
-               /*
-                * Add an entry for this interface, with no addresses.
-                */
-               p[strlen(p) - 1] = '\0'; /* get rid of \n */
-               if (pcap_add_if(devlistp, name, 0, strdup(p + 2), errbuf) == -1) {
-                       /*
-                        * Failure.
-                        */
-                       ret = -1;
-                       break;
-               }
-       }
-       if (ret != -1) {
-               /*
-                * Well, we didn't fail for any other reason; did we
-                * fail due to an error reading the file?
-                */
-               if (ferror(proc_dag_f)) {
-                       (void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
-                                 "Error reading /proc/dag: %s",
-                                 pcap_strerror(errno));
-                       ret = -1;
-               }

        }
        }

-
-       (void)fclose(proc_dag_f);

        return (ret);
 }
 
        return (ret);
 }
 


@@ -658,13 +1151,8 @@ dag_setfilter(pcap_t *p, struct bpf_program *fp)
 
        /* Make our private copy of the filter */
 
 
        /* Make our private copy of the filter */
 

-       if (install_bpf_program(p, fp) < 0) {
-               snprintf(p->errbuf, sizeof(p->errbuf),
-                        "malloc: %s", pcap_strerror(errno));
+       if (install_bpf_program(p, fp) < 0)

                return -1;
                return -1;

-       }
-
-       p->md.use_bpf = 0;

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


@@ -680,86 +1168,212 @@ dag_set_datalink(pcap_t *p, int dlt)
 static int
 dag_setnonblock(pcap_t *p, int nonblock, char *errbuf)
 {
 static int
 dag_setnonblock(pcap_t *p, int nonblock, char *errbuf)
 {

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

        /*
         * 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_offset_flags".

         */
        if (pcap_setnonblock_fd(p, nonblock, errbuf) < 0)
                return (-1);
         */
        if (pcap_setnonblock_fd(p, nonblock, errbuf) < 0)
                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;
+               }

 
 

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

        if (nonblock) {
        if (nonblock) {

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

        } else {
        } else {

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

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

-               
+

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

-       int daglinktype;
+       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) {
+               (void)pcap_snprintf(p->errbuf, sizeof(p->errbuf), "malloc: %s", pcap_strerror(errno));
+               return (-1);
+       }
+
+       p->linktype = 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));
+               return (-1);
+       }
+
+       while (types[index]) {

 
 

-       if (p->dlt_list == NULL && (p->dlt_list = malloc(2*sizeof(*(p->dlt_list)))) == NULL) {
-               (void)snprintf(p->errbuf, sizeof(p->errbuf), "malloc: %s", pcap_strerror(errno));
+#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));

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

+       while (types[index]) {
+#else

        /* Check the type through a dagapi call. */
        /* Check the type through a dagapi call. */

-       daglinktype = dag_linktype(p->fd);
+       types[index] = dag_linktype(p->fd);

 
 

-       switch(daglinktype) {
+       {
+#endif
+               switch((types[index] & 0x7f)) {

 
 

-       case TYPE_HDLC_POS:
-               if (p->dlt_list != NULL) {
-                       p->dlt_count = 2;
-                       p->dlt_list[0] = DLT_CHDLC;
-                       p->dlt_list[1] = DLT_PPP_SERIAL;
-               }
-               p->linktype = DLT_CHDLC;
-               break;
+               case TYPE_HDLC_POS:
+               case TYPE_COLOR_HDLC_POS:
+               case TYPE_DSM_COLOR_HDLC_POS:
+               case TYPE_COLOR_HASH_POS:

 
 

-       case TYPE_ETH:
-               /*
-                * This is (presumably) a real Ethernet capture; give it a
-                * link-layer-type list with DLT_EN10MB and DLT_DOCSIS, so
-                * that an application can let you choose it, in case you're
-                * capturing DOCSIS traffic that a Cisco Cable Modem
-                * Termination System is putting out onto an Ethernet (it
-                * doesn't put an Ethernet header onto the wire, it puts raw
-                * DOCSIS frames out on the wire inside the low-level
-                * Ethernet framing).
-                */
-               if (p->dlt_list != NULL) {
-                       p->dlt_count = 2;
-                       p->dlt_list[0] = DLT_EN10MB;
-                       p->dlt_list[1] = DLT_DOCSIS;
-               }
-               p->linktype = DLT_EN10MB;
-               break;
-
-       case TYPE_AAL5:
-       case TYPE_ATM: 
-               if (p->dlt_list != NULL) {
-                       p->dlt_count = 2;
-                       p->dlt_list[0] = DLT_ATM_RFC1483;
-                       p->dlt_list[1] = DLT_SUNATM;
-               }
-               p->linktype = DLT_ATM_RFC1483;
-               break;
+                       if (p->dlt_list != NULL) {
+                               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;
+
+               case TYPE_ETH:
+               case TYPE_COLOR_ETH:
+               case TYPE_DSM_COLOR_ETH:
+               case 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
+                        * that an application can let you choose it, in case you're
+                        * capturing DOCSIS traffic that a Cisco Cable Modem
+                        * Termination System is putting out onto an Ethernet (it
+                        * doesn't put an Ethernet header onto the wire, it puts raw
+                        * DOCSIS frames out on the wire inside the low-level
+                        * Ethernet framing).
+                        */
+                       if (p->dlt_list != NULL) {
+                               p->dlt_list[dlt_index++] = DLT_EN10MB;
+                               p->dlt_list[dlt_index++] = DLT_DOCSIS;
+                       }
+                       if(!p->linktype)
+                               p->linktype = DLT_EN10MB;
+                       break;

 
 

+               case TYPE_ATM:
+               case TYPE_AAL5:
+               case TYPE_MC_ATM:
+               case 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->linktype)
+                               p->linktype = DLT_ATM_RFC1483;
+                       break;

 
 

-       case TYPE_LEGACY:
-               p->linktype = DLT_NULL;
-               break;
+               case TYPE_COLOR_MC_HDLC_POS:
+               case TYPE_MC_HDLC:
+                       if (p->dlt_list != NULL) {
+                               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;

 
 

-       default:
-               snprintf(p->errbuf, sizeof(p->errbuf), "unknown DAG linktype %d\n", daglinktype);
-               return (-1);
+               case TYPE_IPV4:
+               case TYPE_IPV6:
+                       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:
+               default:
+                       /* Libpcap cannot deal with these types yet */
+                       /* Add no 'native' DLTs, but still covered by DLT_ERF */
+                       break;
+
+               } /* switch */
+               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_t **alldevsp, char *errbuf)
+{
+       *alldevsp = NULL;
+       return (0);
+}
+
+/*
+ * Attempts to open a regular interface fail.
+ */
+pcap_t *
+pcap_create_interface(const char *device, char *errbuf)
+{
+       pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE,
+           "This version of libpcap only supports DAG cards");
+       return NULL;
+}
+#endif