Changeset 32de4c7 for lib/trace.c


Ignore:
Timestamp:
01/08/19 10:36:06 (2 years ago)
Author:
Shane Alcock <salcock@…>
Branches:
develop
Children:
93564ff
Parents:
4ac48fa (diff), f47025d (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 'pcapng_write' of git://github.com/jacobvw/libtrace into jacobvw-pcapng_write

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/trace.c

    r5fe998b r32de4c7  
    17181718        linktype = trace_get_link_type(packet);
    17191719
    1720         if (linktype == TRACE_TYPE_NONDATA || linktype == TRACE_TYPE_ERF_META)
     1720        if (linktype == TRACE_TYPE_NONDATA || linktype == TRACE_TYPE_ERF_META
     1721                || linktype == TRACE_TYPE_PCAPNG_META)
    17211722                return 1;
    17221723
Note: See TracChangeset for help on using the changeset viewer.