Changeset 2c457ec for lib/format_pcapng.c

Timestamp:

11/16/17 10:37:56 (3 years ago)

Author:

Robert A Zeh <razeh@…>

Branches:

cachetimestamps, develop, dpdk-ndag, etsilive, master, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance

Children:

9726d0e

Parents:

be32cc7

git-author:

Robert A Zeh <robert.a.zeh@…> (11/16/17 10:36:16)

git-committer:

Robert A Zeh <razeh@…> (11/16/17 10:37:56)

Message:

Add TRACE_ERR_WANDIO_FAILED for wandio error reporting.

Passing an errcode of 0 to trace_set_err triggers the assertion at
format_helper.c:290, making the error unrecoverable for the calling
code. This happens when the wandio layer encounters an error while
errno is still 0 (for example, an incomplete pcap packet).

To make the error recoverable, pass in TRACE_ERR_WANDIO_FAILED instead
of errno.

File:

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

lib/format_pcapng.c

@@ -330 +330 @@
                 err = wandio_read(libtrace->io, buf, nextread);
                 if (err < 0) {
-                        trace_set_err(libtrace, errno,
+                        trace_set_err(libtrace, TRACE_ERR_WANDIO_FAILED,
                                 "Reading section header options");
                         return -1;
@@ -351 +351 @@
         err = wandio_read(libtrace->io, body, to_read);
         if (err < 0) {
-                trace_set_err(libtrace, errno,
+                trace_set_err(libtrace, TRACE_ERR_WANDIO_FAILED,
                         "Failed to read pcapng interface options");
                 return err;
@@ -444 +444 @@
 
         if (err < 0) {
-                trace_set_err(libtrace, errno,
+                trace_set_err(libtrace, TRACE_ERR_WANDIO_FAILED,
                         "Reading pcapng section header block");
                 return -1;
@@ -519 +519 @@
 
         if (err < 0) {
-                trace_set_err(libtrace, errno,
+                trace_set_err(libtrace, TRACE_ERR_WANDIO_FAILED,
                         "Reading pcapng interface header block");
                 return -1;
@@ -626 +626 @@
 
         if (err < 0) {
-                trace_set_err(libtrace, errno, "reading pcapng name resolution block");
+                trace_set_err(libtrace, TRACE_ERR_WANDIO_FAILED, "reading pcapng name resolution block");
                 return -1;
         }
@@ -682 +682 @@
 
         if (err < 0) {
-                trace_set_err(libtrace, errno, "reading pcapng custom block");
+                trace_set_err(libtrace, TRACE_ERR_WANDIO_FAILED, "reading pcapng custom block");
                 return -1;
         }
@@ -740 +740 @@
 
         if (err < 0) {
-                trace_set_err(libtrace, errno, "reading pcapng interface stats");
+                trace_set_err(libtrace, TRACE_ERR_WANDIO_FAILED, "reading pcapng interface stats");
                 return -1;
         }
@@ -861 +861 @@
 
         if (err < 0) {
-                trace_set_err(libtrace, errno, "reading pcapng simple packet");
+                trace_set_err(libtrace, TRACE_ERR_WANDIO_FAILED, "reading pcapng simple packet");
                 return -1;
         }
@@ -930 +930 @@
 
         if (err < 0) {
-                trace_set_err(libtrace, errno, "reading pcapng enhanced packet");
+                trace_set_err(libtrace, TRACE_ERR_WANDIO_FAILED, "reading pcapng enhanced packet");
                 return -1;
         }
@@ -1039 +1039 @@
                 err = wandio_peek(libtrace->io, &peeker, sizeof(peeker));
                 if (err < 0) {
-                        trace_set_err(libtrace, errno, "reading pcapng packet");
+                        trace_set_err(libtrace, TRACE_ERR_WANDIO_FAILED, "reading pcapng packet");
                         return -1;
                 }
@@ -1048 +1048 @@
 
                 if (err < (int)sizeof(struct pcapng_peeker)) {
-                        trace_set_err(libtrace, errno, "Incomplete pcapng block");
+                        trace_set_err(libtrace, TRACE_ERR_WANDIO_FAILED, "Incomplete pcapng block");
                         return -1;
                 }