Changeset a181666 for lib

Timestamp:

03/08/13 17:03:29 (9 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:

6e6577d

Parents:

19526f3

Message:

Possible fix for the BPF header contains a struct timeval bug

File:

• lib/format_bpf.c (modified) (3 diffs)

lib/format_bpf.c

@@ -78 +78 @@
         uint32_t bh_datalen;            /* wire length */
         uint16_t bh_hdrlen;             /* header length (incl padding) */
+};
+
+struct local_bpf_hdr {
+        struct timeval bh_tstamp;
+        uint32_t bh_caplen;
+        uint32_t bh_datalen;
+        uint16_t bh_hdrlen;
 };
 
@@ -362 +369 @@
                 void *buffer, libtrace_rt_types_t rt_type, uint32_t flags) {
         
+        struct local_bpf_hdr orig;
+        struct local_bpf_hdr *ptr;
+        struct libtrace_bpf_hdr *replace;
+
         /* If the packet previously owned a buffer that is not the buffer
          * that contains the new packet data, we're going to need to free the
@@ -380 +391 @@
         packet->header = buffer;
         packet->type = rt_type;
+
+        /* FreeBSD is stupid and uses a timeval in the bpf header
+         * structure. This means that sometimes our timestamp consumes
+         * 8 bytes and sometimes it consumes 16 bytes.
+         *
+         * Let's try to standardise our header a bit, hopefully without
+         * overwriting anything else important */
+
+        ptr = ((struct local_bpf_hdr *)(packet->header));
+        replace = ((struct libtrace_bpf_hdr *)(packet->header));
+        orig = *ptr;
+        
+        replace->bh_tstamp.tv_sec = (uint32_t) (orig.bh_tstamp.tv_sec & 0xffffffff);
+        replace->bh_tstamp.tv_usec = (uint32_t) (orig.bh_tstamp.tv_usec & 0xffffffff);
+        replace->bh_caplen = orig.bh_caplen;
+        replace->bh_datalen = orig.bh_datalen;
+        replace->bh_hdrlen = orig.bh_hdrlen;
+                
 
         /* Find the payload */