Changeset 1331

Timestamp:

18/03/08 14:12:36 (10 months ago)

Author:

spa1

Message:

• <format>_set_capture_length now resets the cached capture length for the packet, so that subsequent calls to trace_get_capture_length will no longer return the "old" capture length
  
• erf_read_packet should no longer complain about packets with newer ERF types, i.e. ERF type values > 10
  

Files:

• trunk/lib/format_erf.c (modified) (2 diffs)
• trunk/lib/format_pcap.c (modified) (1 diff)
• trunk/lib/format_pcapfile.c (modified) (1 diff)

trunk/lib/format_erf.c

@@ -386 +386 @@
-
-        /* Unknown/corrupt */
-10
+TYPE_AAL2
-                trace_set_err(libtrace, TRACE_ERR_BAD_PACKET, "Corrupt or Unknown ERF type");
-                return -1;
@@ -609 +609 @@
-                return trace_get_capture_length(packet);
-        }
+        /* Reset cached capture length - otherwise we will both return the
+         * wrong value here and subsequent get_capture_length() calls will
+         * return the wrong value. */
+        packet->capture_length = -1;
-        erfptr = (dag_record_t *)packet->header;
-        erfptr->rlen = htons(size + erf_get_framing_length(packet));

trunk/lib/format_pcap.c

@@ -559 +559 @@
-                return trace_get_capture_length(packet);
-        }
+        /* Reset the cached capture length */
+        packet->capture_length = -1;
-        pcapptr = (struct pcap_pkthdr *)packet->header;
-        pcapptr->caplen = size;

trunk/lib/format_pcapfile.c

@@ -497 +497 @@
-                return trace_get_capture_length(packet);
-        }
+        /* Reset the cached capture length */
+        packet->capture_length = -1;
-        pcapptr = (libtrace_pcapfile_pkt_hdr_t *)packet->header;
-        pcapptr->caplen = swapl(packet->trace,(uint32_t)size);