Changeset 65a41fd

Timestamp:

11/17/05 15:05:10 (16 years ago)

Author:

Shane Alcock <salcock@…>

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:

08f7fca

Parents:

de99828

Message:

Fixed bug in erf_write_packet where a packet with an rxerror would have
a NULL payload and hence, rlen would be greater than the amount of data
written out. This causes major problems when the trace is later read back
in.

File:

• lib/format_erf.c (modified) (5 diffs)

lib/format_erf.c

@@ -547 +547 @@
                 return 0;
         }
+
         rlen = ntohs(((dag_record_t *)buffer)->rlen);
         buffer2 = buffer + dag_record_size;
         size = rlen - dag_record_size;
         assert(size < LIBTRACE_PACKET_BUFSIZE);
+        
         /* If your trace is legacy, or corrupt, then this assert may fire. */
         /* turns out some older traces have fixed snaplens, which are padded
@@ -611 +613 @@
         buffer = packet->buffer;
 
+        
         do {
                 if (tracefifo_out_available(libtrace->fifo) == 0 || read_required) {
@@ -627 +630 @@
                 }
                 tracefifo_out_update(libtrace->fifo,sizeof(uint32_t));
-
                 // Read in packet size
                 if (tracefifo_out_read(libtrace->fifo,
@@ -679 +681 @@
                 return -1;
         }
-        if ((numbytes = LIBTRACE_WRITE(OUTPUT.file, buffer, size)) == 0) {
-                perror("libtrace_write");
-                return -1;
-        }
-        return numbytes + pad + dag_record_size;
+
+        if (buffer) {
+                if ((numbytes = LIBTRACE_WRITE(OUTPUT.file, buffer, size)) == 0) {
+                        perror("libtrace_write");
+                        return -1;
+                }
+        
+                return numbytes + pad + dag_record_size;
+        }
+        return numbytes;
 }
                 
@@ -690 +697 @@
         dag_record_t erfhdr;
         int pad = 0;
+        dag_record_t *dag_hdr = (dag_record_t *)packet->buffer;
         void *payload = (void *)trace_get_link(packet);
 
         pad = erf_get_padding(packet);
+
+        /* If we've had an rxerror, we have no payload to write - fix rlen to
+         * be the correct length */
+        if (payload == NULL) {
+                dag_hdr->rlen = htons(dag_record_size + pad);
+        } 
+        
         if (packet->trace->format == &erf || 
 #if HAVE_DAG