Changeset 2193905 for lib/format_pcapfile.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_pcapfile.c (modified) (13 diffs)

lib/format_pcapfile.c

@@ -31 +31 @@
 
 #include <sys/stat.h>
-#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -126 +125 @@
         libtrace->format_data = malloc(sizeof(struct pcapfile_format_data_t));
         if (!libtrace->format_data) {
-                trace_set_err(libtrace, TRACE_ERR_INIT_FAILED, "Unable to allocate memory pcapfile_init_input()");
+                trace_set_err(libtrace, TRACE_ERR_INIT_FAILED, "Unable to allocate memory for "
+                        "format data inside pcapfile_init_input()");
                 return -1;
         }
@@ -139 +139 @@
                 malloc(sizeof(struct pcapfile_format_data_out_t));
         if (!libtrace->format_data) {
-                trace_set_err_out(libtrace, TRACE_ERR_INIT_FAILED, "Unable to allocate memory pcapfile_init_output()");
+                trace_set_err_out(libtrace, TRACE_ERR_INIT_FAILED, "Unable to allocate memory for "
+                        "format data inside pcapfile_init_output()");
                 return -1;
         }
@@ -204 +205 @@
 
                 DATA(libtrace)->started = true;
-                /*assert(sizeof(DATA(libtrace)->header) > 0);*/
                 if (!(sizeof(DATA(libtrace)->header) > 0)) {
                         trace_set_err(libtrace, TRACE_ERR_INIT_FAILED, "Trace is missing header in pcapfile_start_input()");
@@ -352 +352 @@
         size_t bytes_to_read = 0;
 
-        /*assert(libtrace->format_data);*/
         if (!libtrace->format_data) {
-                trace_set_err(libtrace, TRACE_ERR_BAD_FORMAT,
-                        "Trace format data missing, call init_input() before calling pcapfile_read_packet()");
+                trace_set_err(libtrace, TRACE_ERR_BAD_FORMAT, "Trace format data missing, "
+                        "call trace_create() before calling trace_read_packet()");
                 return -1;
         }
@@ -456 +455 @@
                                 TRACE_ERR_NO_CONVERSION,
                                 "pcap does not support this format");
-                        /*assert(0);*/
                         return -1;
                 }
@@ -497 +495 @@
         hdr.ts_usec = (uint32_t)tv.tv_usec;
         hdr.caplen = trace_get_capture_length(packet);
-        /*assert(hdr.caplen < LIBTRACE_PACKET_BUFSIZE);*/
         if (hdr.caplen >= LIBTRACE_PACKET_BUFSIZE) {
                 trace_set_err_out(out, TRACE_ERR_BAD_PACKET, "Capture length is greater than buffer size in pcap_write_packet()");
@@ -579 +576 @@
                 return ts;
         }
-        /*assert(packet->header);*/
+
         if (!packet->header) {
-                trace_set_err(packet->trace, TRACE_ERR_BAD_HEADER, "Trace with NULL header passed to pcapfile_get_timeval()");
+                trace_set_err(packet->trace, TRACE_ERR_BAD_HEADER, "pcap packet with NULL header passed to "
+                        "pcapfile_get_timeval()");
                 /* Return default timeval on error? */
                 return ts;
@@ -607 +605 @@
                 return ts;
         }
-        /*assert(packet->header);*/
+
         if (!packet->header) {
-                trace_set_err(packet->trace, TRACE_ERR_BAD_HEADER, "Trace with NULL header passed to pcapfile_get_timespec()");
+                trace_set_err(packet->trace, TRACE_ERR_BAD_HEADER, "pcap packet with NULL header passed to "
+                        "pcapfile_get_timespec()");
                 /* Return fefault timespec on error? */
                 return ts;
@@ -632 +631 @@
                 return TRACE_ERR_NULL_PACKET;
         }
-        /*assert(packet->header);*/
+
         if (!packet->header) {
-                trace_set_err(packet->trace, TRACE_ERR_BAD_HEADER, "Trace with NULL header passed to pcapfile_get_capture_length()");
+                trace_set_err(packet->trace, TRACE_ERR_BAD_HEADER, "pcap packet with NULL header passed to "
+                        "pcapfile_get_capture_length()");
                 return -1;
         }
@@ -649 +649 @@
                 return TRACE_ERR_NULL_PACKET;
         }
-        /*assert(packet->header); */
+
         if (!packet->header) {
-                trace_set_err(packet->trace, TRACE_ERR_BAD_HEADER, "Trace with NULL header passed to pcapfile_get_wire_length()");
+                trace_set_err(packet->trace, TRACE_ERR_BAD_HEADER, "pcap packet with NULL header passed to "
+                        "pcapfile_get_wire_length()");
                 return -1;
         }
@@ -692 +693 @@
 static size_t pcapfile_set_capture_length(libtrace_packet_t *packet,size_t size) {
         libtrace_pcapfile_pkt_hdr_t *pcapptr = 0;
-        /*assert(packet);*/
+
         if (!packet) {
                 fprintf(stderr, "NULL packet passed into pcapfile_set_capture_length\n");
@@ -698 +699 @@
                 return ~0U;
         }
-        /*assert(packet->header);*/
+
         if (!packet->header) {
-                trace_set_err(packet->trace, TRACE_ERR_BAD_HEADER, "Trace with NULL header passed to pcapfile_set_capture_length()");
+                trace_set_err(packet->trace, TRACE_ERR_BAD_HEADER, "pcap packet with NULL header passed to "
+                        "pcapfile_set_capture_length()");
                 /* Return -1 on error? */
                 return ~0U;