Changeset e17bad6

Timestamp:

06/30/18 23:18:21 (3 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:

• lib/format_pcapng.c (modified) (3 diffs)

lib/format_pcapng.c

@@ -730 +730 @@
                 to_read = byteswap32(hdr->blocklen) - sizeof(pcapng_custom_t);
         } else {
-                assert(hdr->blocktype == PCAPNG_NAME_RESOLUTION_TYPE ||
+                assert(hdr->blocktype == PCAPNG_CUSTOM_TYPE ||
                         hdr->blocktype == PCAPNG_CUSTOM_NONCOPY_TYPE);
                 to_read = hdr->blocklen - sizeof(pcapng_custom_t);
@@ -827 +827 @@
                 if (optval == NULL) {
                         trace_set_err(libtrace, TRACE_ERR_BAD_PACKET,
-                                "Failed to read options for pcapng enhanced packet");
+                                "Failed to read options for pcapng interface stats");
                         return -1;
                 }
@@ -1078 +1078 @@
                 }
 
+                // Warning: the byteorder might not be set yet, the section header sets this
                 if (DATA(libtrace)->byteswapped) {
                         btype = byteswap32(peeker.blocktype);