Changeset d51fd26

Timestamp:

01/09/15 09:26:47 (7 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:

4cc6e74

Parents:

bdc8b36

Message:

Fix snap length being set to 0 incorrectly, when the snap length had not been set.

File:

• lib/trace_parallel.c (modified) (4 diffs)

lib/trace_parallel.c

@@ -541 +541 @@
                         else if (ret != nb_packets) {
                                 // Refill the empty packets
-                                printf("Refilling packets ret=%d nb_packets=%z\n", ret, nb_packets);
+                                printf("Refilling packets ret=%d nb_packets=%zd\n", ret, nb_packets);
                                 libtrace_ocache_alloc(&trace->packet_freelist, (void **) &packets[ret], nb_packets - ret, nb_packets - ret);
                         }
@@ -1386 +1386 @@
                         /* Finalise the packets, freeing any resources the format module
                          * may have allocated it and zeroing all data associated with it.
-                         *./
+                         */
                         //trace_fin_packet(packets[i]);
                         /* Store the trace we are reading from into the packet opaque
@@ -1412 +1412 @@
                                                 filtered_pkts[nb_filtered++] = packets[i];
                                                 packets[i] = NULL;
-                                        } else if (libtrace->snaplen>0) {
-                                                /* Snap the packet */
-                                                trace_set_capture_length(packets[i],
-                                                                libtrace->snaplen);
+                                        } else {
+                                                if (libtrace->snaplen>0)
+                                                        /* Snap the packet */
+                                                        trace_set_capture_length(packets[i],
+                                                                        libtrace->snaplen);
                                                 trace_packet_set_order(packets[i], trace_get_erf_timestamp(packets[i]));
                                         }
@@ -1430 +1431 @@
                         } else {
                                 for (i = 0; i < ret; ++i) {
-                                        trace_set_capture_length(packets[i],
-                                                        libtrace->snaplen);
+                                        if (libtrace->snaplen>0)
+                                                trace_set_capture_length(packets[i],
+                                                                libtrace->snaplen);
                                         trace_packet_set_order(packets[i], trace_get_erf_timestamp(packets[i]));
                                 }