Changeset e17bad6


Ignore:
Timestamp:
06/30/18 23:18:21 (2 years ago)
Author:
Richard Sanger <rsanger@…>
Branches:
cachetimestamps, develop, master, rc-4.0.4, ringdecrementfix, ringperformance
Children:
fc6def2
Parents:
c171463
Message:

Fix some obvious copy paste errors in pcapng

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/format_pcapng.c

    rc171463 re17bad6  
    730730                to_read = byteswap32(hdr->blocklen) - sizeof(pcapng_custom_t);
    731731        } else {
    732                 assert(hdr->blocktype == PCAPNG_NAME_RESOLUTION_TYPE ||
     732                assert(hdr->blocktype == PCAPNG_CUSTOM_TYPE ||
    733733                        hdr->blocktype == PCAPNG_CUSTOM_NONCOPY_TYPE);
    734734                to_read = hdr->blocklen - sizeof(pcapng_custom_t);
     
    827827                if (optval == NULL) {
    828828                        trace_set_err(libtrace, TRACE_ERR_BAD_PACKET,
    829                                 "Failed to read options for pcapng enhanced packet");
     829                                "Failed to read options for pcapng interface stats");
    830830                        return -1;
    831831                }
     
    10781078                }
    10791079
     1080                // Warning: the byteorder might not be set yet, the section header sets this
    10801081                if (DATA(libtrace)->byteswapped) {
    10811082                        btype = byteswap32(peeker.blocktype);
Note: See TracChangeset for help on using the changeset viewer.