Changeset de74f88

Timestamp:

02/13/15 13:51:44 (6 years ago)

Author:

Richard Sanger <rsangerarj@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

1ebc4bd

Parents:

4631115

Message:

Fix some DAG compile issues from the merge

File:

• lib/format_dag25.c (modified) (3 diffs)

lib/format_dag25.c

@@ -890 +890 @@
 
         /* DUCK doesn't have a format header */
-        packet->header = 0;
-        packet->payload = packet->buffer;
-
-        /* No need to check if we can get DUCK or not - we're modern
-         * enough so just grab the DUCK info */
-        if ((ioctl(FORMAT_DATA->device->fd, LIBTRACE_DUCK_IOCTL,
-                                        (duckinf_t *)packet->payload) < 0)) {
-                trace_set_err(libtrace, errno, "Error using DUCK ioctl");
+        packet->header = 0;
+        packet->payload = packet->buffer;
+
+        /* No need to check if we can get DUCK or not - we're modern
+         * enough so just grab the DUCK info */
+        if ((ioctl(FORMAT_DATA_FIRST->device->fd, LIBTRACE_DUCK_IOCTL,
+                   (duckinf_t *)packet->payload) < 0)) {
+                trace_set_err(libtrace, errno, "Error using DUCK ioctl");
                 DUCK.duck_freq = 0;
-                return -1;
-        }
-
-        packet->type = LIBTRACE_DUCK_VERSION;
+                return -1;
+        }
+
+        packet->type = LIBTRACE_DUCK_VERSION;
 
         /* Set the packet's trace to point at a DUCK trace, so that the
          * DUCK format functions will be called on the packet rather than the
          * DAG ones */
-        if (!DUCK.dummy_duck)
-                DUCK.dummy_duck = trace_create_dead("duck:dummy");
-        packet->trace = DUCK.dummy_duck;
-        DUCK.last_duck = DUCK.last_pkt;
-        return sizeof(duckinf_t);
+        if (!DUCK.dummy_duck)
+                DUCK.dummy_duck = trace_create_dead("duck:dummy");
+        packet->trace = DUCK.dummy_duck;
+        DUCK.last_duck = DUCK.last_pkt;
+        return sizeof(duckinf_t);
 }
 
@@ -1217 +1217 @@
                                 libtrace_packet_t *packet)
 {
+        int size = 0;
         dag_record_t *erfptr = NULL;
         int numbytes = 0;
@@ -1227 +1228 @@
         maxwait.tv_usec = 250000;
 
-        /* Check if we're due for a DUCK report */
+        /* Check if we're due for a DUCK report */
         size = dag_get_duckinfo(libtrace, packet);