Changeset 4811b1e

Timestamp:

03/16/10 10:55:34 (12 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:

ac7037b

Parents:

7fc0eaa2

Message:

• Fixed bug where the header pointer was not set correctly for packets that had no payload other than the PCAP header
• Added a few extra asserts so that we can have a slightly more graceful exit when the header pointer isn't set correctly rather than just segfaulting :)

File:

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

lib/format_pcapfile.c

@@ -345 +345 @@
          * misinterpret as EOF! */
         if (bytes_to_read == 0) {
+                packet->header = packet->buffer;
                 return sizeof(libtrace_pcapfile_pkt_hdr_t);
         }
@@ -434 +435 @@
         assert(hdr.caplen < LIBTRACE_PACKET_BUFSIZE);
         /* PCAP doesn't include the FCS in its wire length value, but we do */
-        if (linktype==TRACE_TYPE_ETH)
+        if (linktype==TRACE_TYPE_ETH) {
                 if (trace_get_wire_length(packet) >= 4) {
                         hdr.wirelen = trace_get_wire_length(packet)-4;
@@ -441 +442 @@
                         hdr.wirelen = 0;
                 }
+        }
         else
                 hdr.wirelen = trace_get_wire_length(packet);
@@ -544 +546 @@
                 const libtrace_packet_t *packet) 
 {
-        libtrace_pcapfile_pkt_hdr_t *hdr =
-                (libtrace_pcapfile_pkt_hdr_t*)packet->header;
+        libtrace_pcapfile_pkt_hdr_t *hdr;
         struct timeval ts;
+        
+        assert(packet->header);
+        
+        hdr = (libtrace_pcapfile_pkt_hdr_t*)packet->header;
         ts.tv_sec = swapl(packet->trace,hdr->ts_sec);
         ts.tv_usec = swapl(packet->trace,hdr->ts_usec);
@@ -554 +559 @@
 
 static int pcapfile_get_capture_length(const libtrace_packet_t *packet) {
-        libtrace_pcapfile_pkt_hdr_t *pcapptr 
-                = (libtrace_pcapfile_pkt_hdr_t *)packet->header;
+        libtrace_pcapfile_pkt_hdr_t *pcapptr; 
+
+        assert(packet->header);
+        pcapptr = (libtrace_pcapfile_pkt_hdr_t *)packet->header;
 
         return swapl(packet->trace,pcapptr->caplen);
@@ -561 +568 @@
 
 static int pcapfile_get_wire_length(const libtrace_packet_t *packet) {
-        libtrace_pcapfile_pkt_hdr_t *pcapptr 
-                = (libtrace_pcapfile_pkt_hdr_t *)packet->header;
+        libtrace_pcapfile_pkt_hdr_t *pcapptr;
+         
+        assert(packet->header); 
+
+        pcapptr = (libtrace_pcapfile_pkt_hdr_t *)packet->header;
         if (packet->type==pcap_linktype_to_rt(TRACE_DLT_EN10MB))
                 /* Include the missing FCS */
@@ -589 +599 @@
         libtrace_pcapfile_pkt_hdr_t *pcapptr = 0;
         assert(packet);
+        assert(packet->header);
         if (size > trace_get_capture_length(packet)) {
                 /* Can't make a packet larger */