Fix various bugs observed when converting from etsifile to pcapfile

 * fix bad trace type in etsifile format definition
 * fix memory leak when demoting a packet during pcapfile format
   conversion
 * fix bad setting of packet->error when reading a packet using
   etsifile format

Author: salcock

lib/format_etsifile.c

@@ -124,7 +124,7 @@ static int etsifile_prepare_received(libtrace_t *libtrace,
     wandder_attach_etsili_buffer(INPUT->decoder, packet->buffer, length, false);
     packet->cached.wire_length = wandder_etsili_get_pdu_length(INPUT->decoder);
     packet->cached.capture_length = packet->cached.wire_length;
-    packet->error = packet->cached.capture_length;
+    packet->error = 0;
     packet->fmtdata = NULL;
 
     tv = wandder_etsili_get_header_timestamp(INPUT->decoder);
@@ -383,7 +383,7 @@ static void etsifile_help(void)
 static struct libtrace_format_t etsifile = {
     "etsifile",
     "$Id$",
-    TRACE_FORMAT_ETSILIVE,
+    TRACE_FORMAT_ETSIFILE,
     NULL,                        /* probe filename */
     NULL,                        /* probe magic */
     etsifile_init_input,         /* init_input */

lib/libtrace_int.h

@@ -184,6 +184,8 @@ static inline int posix_memalign(void **memptr, size_t alignment, size_t size)
 
 #define MAX_THREADS 128
 
+extern int libtrace_parallel;
+
 /** Data about the most recent event from a trace file */
 struct libtrace_event_status_t {
     /** A libtrace packet to store the packet when a PACKET event occurs */

lib/linktypes.c

@@ -432,8 +432,9 @@ static void replacement_pcap_header(libtrace_packet_t *packet, char *payload,
 
     char *tmp;
 
-    tmp = (char *)malloc(trace_get_capture_length(packet) +
-                         sizeof(libtrace_pcapfile_pkt_hdr_t));
+    //tmp = (char *)malloc(trace_get_capture_length(packet) +
+    //                     sizeof(libtrace_pcapfile_pkt_hdr_t));
+    tmp = (char *)malloc(LIBTRACE_PACKET_BUFSIZE);
 
     ((libtrace_pcapfile_pkt_hdr_t *)tmp)->ts_sec = tv->tv_sec;
     ((libtrace_pcapfile_pkt_hdr_t *)tmp)->ts_usec = tv->tv_usec;
@@ -455,6 +456,14 @@ static void replacement_pcap_header(libtrace_packet_t *packet, char *payload,
 
     /* Invalidate caches */
     trace_clear_cache(packet);
+
+    /* This packet is about to gain a new "parent" trace, so make sure the old
+     * trace doesn't keep a reference to it
+     */
+    if (!libtrace_parallel && packet->trace &&
+            packet->trace->last_packet == packet) {
+        packet->trace->last_packet = NULL;
+    }
 }
 
 /* Try and remove any extraneous encapsulation that may have been added to

lib/trace.c

@@ -1164,6 +1164,10 @@ DLLEXPORT int trace_read_packet(libtrace_t *libtrace, libtrace_packet_t *packet)
                 continue;
             }
             if (ret == (size_t)-1 || ret == 0) {
+                /* shouldn't need to do this, but just to be safe... */
+                if (!libtrace_parallel && libtrace->last_packet == packet) {
+                    libtrace->last_packet = NULL;
+                }
                 packet->trace = NULL;
                 return ret;
             }

lib/trace_parallel.c

@@ -91,8 +91,6 @@
 static inline int delay_tracetime(libtrace_t *libtrace,
                                   libtrace_packet_t *packet,
                                   libtrace_thread_t *t);
-extern int libtrace_parallel;
-
 struct mem_stats {
     struct memfail {
         uint64_t cache_hit;