Add stream support to dag_create()

DAG capture device names are of the format dagN or dagN:M where N
is the device number and M is the stream number. The former implies
stream 0.

diff --git a/pcap-dag.c b/pcap-dag.c
index 0d9fc7572906f4c29bb29500f5fcb1c82f9ae3c9..247bee8774f87844899a7017d5a589f5073314b3 100644 (file)
--- a/pcap-dag.c
+++ b/pcap-dag.c
@@ -50,9 +50,12 @@ struct rtentry;              /* declarations in <net/if.h> */
 
 /*
  * DAG devices have names beginning with "dag", followed by a number
 
 /*
  * DAG devices have names beginning with "dag", followed by a number

- * from 0 to MAXDAG.
+ * from 0 to DAG_MAX_BOARDS, then optionally a colon and a stream number
+ * from 0 to DAG_STREAM_MAX.

  */
  */

-#define MAXDAG 31
+#ifndef DAG_MAX_BOARDS
+#define DAG_MAX_BOARDS 32
+#endif

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


@@ -870,6 +873,9 @@ pcap_t *dag_create(const char *device, char *ebuf, int *is_ours)
        char *cpend;
        long devnum;
        pcap_t *p;
        char *cpend;
        long devnum;
        pcap_t *p;

+#ifdef HAVE_DAG_STREAMS_API
+       long stream = 0;
+#endif

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


@@ -881,19 +887,32 @@ pcap_t *dag_create(const char *device, char *ebuf, int *is_ours)
                *is_ours = 0;
                return NULL;
        }
                *is_ours = 0;
                return NULL;
        }

-       /* Yes - is "dag" followed by a number from 0 to MAXDAG? */
+       /* Yes - is "dag" followed by a number from 0 to DAG_MAX_BOARDS-1 */

        cp += 3;
        devnum = strtol(cp, &cpend, 10);
        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 (cpend == cp || *cpend != '\0') {
                /* Not followed by a number. */
                *is_ours = 0;
                return NULL;
        }

-       if (devnum < 0 || devnum > MAXDAG) {
+       if (devnum < 0 || devnum >= DAG_MAX_BOARDS) {

                /* Followed by a non-valid number. */
                *is_ours = 0;
                return NULL;
        }
                /* 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

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


@@ -940,8 +959,8 @@ dag_findalldevs(pcap_if_t **devlistp, char *errbuf)
        int dagstream;
        int dagfd;
 
        int dagstream;
        int dagfd;
 

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

                snprintf(name, 12, "dag%d", c);
                if (-1 == dag_parse_name(name, dagname, DAGNAME_BUFSIZE, &dagstream))
                {
                snprintf(name, 12, "dag%d", c);
                if (-1 == dag_parse_name(name, dagname, DAGNAME_BUFSIZE, &dagstream))
                {