Ignore:
Timestamp:
11/29/18 13:37:20 (23 months 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:
1 edited

Legend:

Unmodified
Added
Removed
  • tools/tracereplay/tracereplay.c

    r8a12a49 rd7d3267  
    104104
    105105        pkt_buffer = trace_get_packet_buffer(packet,&linktype,&remaining);
     106        /* Check if the linktype was found, if not skip this packet */
     107        if (linktype == TRACE_TYPE_UNKNOWN || linktype == TRACE_TYPE_CONTENT_INVALID) {
     108                return NULL;
     109        }
     110
    106111        remaining = 0;
    107112        new_packet = trace_create_packet();
Note: See TracChangeset for help on using the changeset viewer.