Changeset 2fa43fa for lib

Timestamp:

08/25/15 17:43:01 (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:

9a3a846

Parents:

f2066fa

Message:

Fixes an issue with old programs reusing a packet over multi traces

Fixes a bug that Shane found. In the case an old libtrace program used
a single packet and cycled over multiple traces. Closing the trace
and then reusing the packet with a new trace will try to finish
the packet which requires the old format to be present.

As such we now keep track of the last packet against the format,
and finish this when the trace is destroyed.

Location:

lib

Files:

• libtrace_int.h (modified) (1 diff)
• trace.c (modified) (6 diffs)

lib/libtrace_int.h

@@ -307 +307 @@
         /** The sequence is like accepted_packets but we don't reset this after a pause. */
         uint64_t sequence_number;
+        /** The packet read out by the trace, backwards compatibility to allow us to finalise
+         * a packet when the trace is destroyed */
+        libtrace_packet_t *last_packet;
         /** The filename from the uri for the trace */
         char *uridata;

lib/trace.c

@@ -261 +261 @@
         libtrace->filtered_packets = 0;
         libtrace->accepted_packets = 0;
+        libtrace->last_packet = NULL;
         
         /* Parallel inits */
@@ -383 +384 @@
         libtrace->io = NULL;
         libtrace->filtered_packets = 0;
+        libtrace->accepted_packets = 0;
+        libtrace->last_packet = NULL;
         
         /* Parallel inits */
@@ -549 +552 @@
                 return -1;
         }
+
+        /* Finish the last packet we read - for backwards compatibility */
+        if (libtrace->last_packet)
+                trace_fin_packet(libtrace->last_packet);
+        assert(libtrace->last_packet == NULL);
+
         if (libtrace->format->pause_input)
                 libtrace->format->pause_input(libtrace);
+
         libtrace->started=false;
         return 0;
@@ -689 +699 @@
         }
 
+        /* Finish any the last packet we read - for backwards compatibility */
+        if (libtrace->last_packet)
+                trace_fin_packet(libtrace->last_packet);
+        assert(libtrace->last_packet == NULL);
+
         if (libtrace->format) {
                 if (libtrace->started && libtrace->format->pause_input)
@@ -827 +842 @@
                         packet->trace->format->fin_packet(packet);
                 }
+                if (packet->trace && packet->trace->last_packet == packet)
+                        packet->trace->last_packet = NULL;
 
                 // No matter what we remove the header and link pointers
@@ -905 +922 @@
                         ++libtrace->accepted_packets;
                         ++libtrace->sequence_number;
+                        libtrace->last_packet = packet;
                         return ret;
                 } while(1);