Changeset 0210df3

Timestamp:

04/27/06 01:26:33 (16 years ago)

Author:

Perry Lorier <perry@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

af1e721

Parents:

4927e86

Message:

Fixed bug where wag packets capture length was set too long when reading from
a trace.

File:

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

lib/format_wag.c

@@ -180 +180 @@
 {
         close(INPUT.fd);
-
         return 0;
 }
@@ -322 +321 @@
         size = framesize - sizeof(struct frame_t);
         assert(size < LIBTRACE_PACKET_BUFSIZE);
-
+        assert(size > 0);
         
         if ((numbytes=libtrace_io_read(INPUT.file, buffer2, size)) != size) {
@@ -383 +382 @@
 
 static int wag_get_capture_length(const struct libtrace_packet_t *packet) {
-        struct frame_data_rx_t *wagptr = (struct frame_data_rx_t *)packet->buffer;
-        return ntohs(wagptr->hdr.size);
+        return ntohs(((struct frame_t *)packet->header)->size)
+                -sizeof(struct frame_data_rx_t);
 }
 
 static int wag_get_wire_length(const struct libtrace_packet_t *packet) {
-        struct frame_data_rx_t *wagptr = (struct frame_data_rx_t *)packet->buffer;
-        return ntohs(wagptr->hdr.size);
+        return ntohs(((struct frame_t *)packet->header)->size)
+                -sizeof(struct frame_data_rx_t);
 }