Changeset b3dca4d for lib

Timestamp:

09/14/15 11:25:29 (6 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, 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:

a6b44a7

Parents:

322c516

Message:

Don't rely on rlen for determining write sizes for ERF packets

Sometimes rlen is greater than the capture + framing length for a packet, e.g.
in cases where the wlen is less than the rlen. Basing our arithmetic off
rlen can mean that we try to write too much data (especially if the packet
buffer has been sized to perfectly fit the packet according to
trace_get_capture_length and trace_get_framing_length). This will happen
if the ERF packets have been received via RT, for instance.

Also replace use of "dag_record_size + pad" with trace_get_framing_length() in
the same arithmetic, so that our write sizes are correct in the presence of
ERF extension headers.

File:

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

lib/format_erf.c

@@ -559 +559 @@
 
 static int erf_dump_packet(libtrace_out_t *libtrace,
-                dag_record_t *erfptr, unsigned int pad, void *buffer) {
+                dag_record_t *erfptr, int framinglen, void *buffer,
+                int caplen) {
         int numbytes = 0;
         int size;
@@ -566 +567 @@
                 wandio_wwrite(OUTPUT->file, 
                                 erfptr,
-                                (size_t)(dag_record_size + pad))) 
-                        != (int)(dag_record_size+pad)) {
+                                (size_t)(framinglen))) 
+                        != (int)(framinglen)) {
                 trace_set_err_out(libtrace,errno,
                                 "write(%s)",libtrace->uridata);
@@ -573 +574 @@
         }
 
-        size=ntohs(erfptr->rlen)-(dag_record_size+pad);
-        numbytes=wandio_wwrite(OUTPUT->file, buffer, (size_t)size);
+        size=caplen-(framinglen);
+        numbytes=wandio_wwrite(OUTPUT->file, buffer, (size_t)size);
         if (numbytes != size) {
                 trace_set_err_out(libtrace,errno,
@@ -580 +581 @@
                 return -1;
         }
-        return numbytes + pad + dag_record_size;
+        return numbytes + framinglen;
 }
 
@@ -653 +654 @@
                         numbytes = erf_dump_packet(libtrace,
                                 (dag_record_t *)packet->header,
-                                pad,
-                                payload
+                                trace_get_framing_length(packet),
+                                payload,
+                                trace_get_capture_length(packet)
                                 );
         } else {
@@ -698 +700 @@
                 numbytes = erf_dump_packet(libtrace,
                                 &erfhdr,
-                                pad,
-                                payload);
+                                framing,
+                                payload,
+                                trace_get_capture_length(packet));
         }
         return numbytes;