Changeset 2193905 for lib/format_dag25.c

Timestamp:

11/29/18 10:12:59 (2 years ago)

Author:

Jacob Van Walraven <jcv9@…>

Branches:

develop

Children:

fdf23b8

Parents:

d74ca03

Message:

Apply changes required for pull request #81

File:

• lib/format_dag25.c (modified) (7 diffs)

lib/format_dag25.c

@@ -33 +33 @@
 #include "format_erf.h"
 
-#include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -245 +244 @@
         FORMAT_DATA->per_stream =
                 libtrace_list_init(sizeof(stream_data));
-        /*assert(FORMAT_DATA->per_stream != NULL);*/
         if (FORMAT_DATA->per_stream == NULL) {
                 trace_set_err(libtrace, TRACE_ERR_INIT_FAILED,
@@ -289 +287 @@
 {
         /* Need to remove from the device list */
-        /*assert(dev->ref_count == 0);*/
         if (dev->ref_count != 0) {
                 fprintf(stderr, "Cannot close DAG device with non zero reference in dag_close_device()\n");
@@ -1005 +1002 @@
 
         size = ntohs(erfptr->rlen);
-        /*assert( size >= dag_record_size );*/
         if (size < dag_record_size) {
-                fprintf(stderr, "Incorrect dag record size in dag_get_record()\n");
+                fprintf(stderr, "DAG2.5 rlen is invalid (rlen %u, must be at least %u\n",
+                        size, dag_record_size);
                 return NULL;
         }
@@ -1239 +1236 @@
 
                 /* Packet length (rlen includes format overhead) */
-                /*assert(trace_get_capture_length(packet) > 0
-                       && trace_get_capture_length(packet) <= 65536);*/
-                if (!(trace_get_capture_length(packet) > 0
-                       && trace_get_capture_length(packet) <= 65536)) {
+                if (trace_get_capture_length(packet) <= 0
+                       || trace_get_capture_length(packet) > 65536) {
                         trace_set_err(libtrace, TRACE_ERR_BAD_PACKET,
                                 "Capture length is out of range in dag_write_packet()");
                         return -1;
                 }
-                /*assert(erf_get_framing_length(packet) > 0
-                       && trace_get_framing_length(packet) <= 65536);*/
-                if (!(erf_get_framing_length(packet) > 0
-                       && trace_get_framing_length(packet) <= 65536)) {
+                if (erf_get_framing_length(packet) <= 0
+                       || trace_get_framing_length(packet) > 65536) {
                         trace_set_err(libtrace, TRACE_ERR_BAD_PACKET,
                                 "Framing length is out of range in dag_write_packet()");
                         return -1;
                 }
-                /*assert(trace_get_capture_length(packet) +
-                       erf_get_framing_length(packet) > 0
-                       && trace_get_capture_length(packet) +
-                       erf_get_framing_length(packet) <= 65536);*/
-                if (!(trace_get_capture_length(packet) +
-                       erf_get_framing_length(packet) > 0
-                       && trace_get_capture_length(packet) +
-                       erf_get_framing_length(packet) <= 65536)) {
+                if (trace_get_capture_length(packet) +
+                       erf_get_framing_length(packet) <= 0
+                       || trace_get_capture_length(packet) +
+                       erf_get_framing_length(packet) > 65536) {
                         trace_set_err(libtrace, TRACE_ERR_BAD_PACKET,
                                 "Capture + framing length is out of range in dag_write_packet()");
@@ -1516 +1505 @@
 {
         libtrace_list_node_t *tmp;
-        /*assert(stat && libtrace);*/
         if (!libtrace) {
                 fprintf(stderr, "NULL trace passed into dag_get_statistics()\n");
@@ -1540 +1528 @@
                                        libtrace_stat_t *stat) {
         struct dag_per_stream_t *stream_data = t->format_data;
-        /*assert(stat && libtrace);*/
         if (!libtrace) {
                 fprintf(stderr, "NULL trace passed into dag_get_thread_statistics()\n");