Changeset f65c480

Timestamp:

06/08/09 11:14:17 (13 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:

a7e85bf

Parents:

327b1df

Message:

• Check for errors / EOF before asserting based on the contents of what we've supposedly read from the trace

File:

• lib/format_pcapfile.c (modified) (2 diffs)

lib/format_pcapfile.c

@@ -295 +295 @@
                         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");
@@ -305 +303 @@
                 return 0;
         }
+        
+        assert(swapl(libtrace,((libtrace_pcapfile_pkt_hdr_t*)packet->buffer)->caplen)<LIBTRACE_PACKET_BUFSIZE);
+
 
         err=wandio_read(libtrace->io,