Changeset d7d3267 for tools/tracereplay

Timestamp:

11/29/18 13:37:20 (2 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

develop

Children:

50e9c6b

Parents:

54642da (diff), fdf23b8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​git://github.com/jacobvw/libtrace into jacobvw-master

Conflicts:

lib/format_linux_ring.c

File:

• tools/tracereplay/tracereplay.c (modified) (1 diff)

tools/tracereplay/tracereplay.c

@@ -104 +104 @@
 
         pkt_buffer = trace_get_packet_buffer(packet,&linktype,&remaining);
+        /* Check if the linktype was found, if not skip this packet */
+        if (linktype == TRACE_TYPE_UNKNOWN || linktype == TRACE_TYPE_CONTENT_INVALID) {
+                return NULL;
+        }
+
         remaining = 0;
         new_packet = trace_create_packet();