Changeset 1370

Timestamp:

14/10/08 10:03:46 (3 months ago)

Author:

perry

Message:

Be more aggressive in looking for bad packets.

Files:

• trunk/lib/format_pcapfile.c (modified) (3 diffs)

trunk/lib/format_pcapfile.c

@@ -273 +273 @@
-                        sizeof(libtrace_pcapfile_pkt_hdr_t));
-
+        assert(swapl(libtrace,((libtrace_pcapfile_pkt_hdr_t*)packet->buffer)->caplen)<LIBTRACE_PACKET_BUFSIZE);
+
-        if (err<0) {
-                trace_set_err(libtrace,errno,"reading packet");
@@ -367 +369 @@
-        hdr.ts_usec = tv.tv_usec;
-        hdr.caplen = trace_get_capture_length(packet);
+        assert(hdr.caplen < LIBTRACE_PACKET_BUFSIZE);
-        /* PCAP doesn't include the FCS, we do */
-        if (linktype==TRACE_TYPE_ETH)
@@ -377 +380 @@
-        else
-                hdr.wirelen = trace_get_wire_length(packet);
+
+        assert(hdr.wirelen < LIBTRACE_PACKET_BUFSIZE);
-
-