Changeset 5f329ab


Ignore:
Timestamp:
10/06/10 13:37:07 (10 years ago)
Author:
Shane Alcock <salcock@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, 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:
c259635
Parents:
3038cd2
Message:
  • Don't attempt to write out NONDATA packets, as these cannot be converted into an appropriate DLT, ERF type or similar
Location:
lib
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • lib/format_dag25.c

    rd9b0550 r5f329ab  
    956956                return -1;
    957957        }
     958
     959        if (trace_get_link_type(packet) == TRACE_TYPE_NONDATA)
     960                return 0;
    958961
    959962        pad = dag_get_padding(packet);
  • lib/format_erf.c

    rb5af22c r5f329ab  
    582582
    583583        assert(OUTPUT->file);
     584
     585        if (trace_get_link_type(packet) == TRACE_TYPE_NONDATA)
     586                return 0;
    584587
    585588        if (!packet->header) {
  • lib/format_linux.c

    r9f1b6ee r5f329ab  
    573573{
    574574        struct sockaddr_ll hdr;
     575
     576        if (trace_get_link_type(packet) == TRACE_TYPE_NONDATA)
     577                return 0;
    575578
    576579        hdr.sll_family = AF_PACKET;
  • lib/format_pcap.c

    r7837dc4 r5f329ab  
    490490{
    491491        int err;
     492
     493        if (trace_get_link_type(packet) == TRACE_TYPE_NONDATA)
     494                return 0;
    492495
    493496        if (!OUTPUT.trace.pcap) {
  • lib/format_pcapfile.c

    r4e94095 r5f329ab  
    399399        /* Silently discard RT metadata packets and packets with an
    400400         * unknown linktype. */
    401         if (linktype == TRACE_TYPE_METADATA || linktype == ~0U) {
     401        if (linktype == TRACE_TYPE_NONDATA || linktype == ~0U) {
    402402                return 0;
    403403        }
     
    411411                                TRACE_ERR_NO_CONVERSION,
    412412                                "pcap does not support this format");
     413                        assert(0);
    413414                        return -1;
    414415                }
Note: See TracChangeset for help on using the changeset viewer.