Changeset f57715c8 for lib

Timestamp:

05/25/06 14:59:54 (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:

77a38d9

Parents:

961f687

Message:

Fix writing out erf files
Fix the "padding" being counted as part of the wire length!

File:

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

lib/format_erf.c

@@ -224 +224 @@
 static int erf_get_padding(const libtrace_packet_t *packet)
 {
-        dag_record_t *erfptr = (dag_record_t *)packet->header;
-        switch(erfptr->type) {
-                case TYPE_ETH:          return 2;
-                default:                return 0;
+        if (packet->trace->format->type==TRACE_FORMAT_ERF) {
+                dag_record_t *erfptr = (dag_record_t *)packet->header;
+                switch(erfptr->type) {
+                        case TYPE_ETH:          return 2;
+                        default:                return 0;
+                }
+        }
+        else {
+                switch(trace_get_link_type(packet)) {
+                        case TYPE_ETH:          return 2;
+                        default:                return 0;
+                }
         }
 }
@@ -733 +741 @@
                         return -1;
                 }
+                trace_set_err(libtrace,EIO,"Truncated packet (wanted %d, got %d)", size, numbytes);
                 /* Failed to read the full packet?  must be EOF */
-                return 0;
+                return -1;
         }
         if (((dag_record_t *)packet->buffer)->flags.rxerror == 1) {
@@ -932 +941 @@
                 memset(&erfhdr.flags,1,sizeof(erfhdr.flags));
                 /* Packet length (rlen includes format overhead) */
-                erfhdr.rlen = trace_get_capture_length(packet) 
-                        + erf_get_framing_length(packet);
+                erfhdr.rlen = htons(trace_get_capture_length(packet) 
+                        + erf_get_framing_length(packet));
                 /* loss counter. Can't do this */
                 erfhdr.lctr = 0;
-                /* Wire length */
-                erfhdr.wlen = trace_get_wire_length(packet);
+                /* Wire length, may contain the padding */
+                erfhdr.wlen = htons(trace_get_wire_length(packet)+pad);
 
                 /* Write it out */
@@ -983 +992 @@
         dag_record_t *erfptr = 0;
         erfptr = (dag_record_t *)packet->header;
-        return ntohs(erfptr->wlen);
+        return ntohs(erfptr->wlen) - erf_get_padding(packet);
 }