Changeset c0dba7a

Timestamp:

04/02/08 16:26:47 (14 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:

007fb43

Parents:

590fb30

Message:

• Fixed compile error on systems where bh_tstamp in the bpf header is a bpf_timeval rather than a timeval, e.g. OpenBSD ( Reported by Niclas Rosell )
• Updated all formats that require it to use the new "Do not own the buffer" prepare_packet flag

Location:

lib

Files:

• format_bpf.c (modified) (2 diffs)
• format_dag24.c (modified) (1 diff)
• format_dag25.c (modified) (1 diff)
• format_rt.c (modified) (1 diff)

lib/format_bpf.c

@@ -353 +353 @@
                                 FORMATIN(libtrace)->buffer;
         }
-
+        flags |= TRACE_PREP_DO_NOT_OWN_BUFFER;
         /* Read one packet out */
         
@@ -388 +388 @@
 {
         struct timeval tv;
-        tv=BPFHDR(packet)->bh_tstamp;
+        /* OpenBSD uses a bpf_timeval rather than a timeval so we must copy
+         * each timeval element individually rather than doing a structure
+         * assignment */
+        tv.tv_sec = BPFHDR(packet)->bh_tstamp.tv_sec;
+        tv.tv_usec = BPFHDR(packet)->bh_tstamp.tv_usec;
+
         return tv;
 }

lib/format_dag24.c

@@ -325 +325 @@
         }
 
+        flags |= TRACE_PREP_DO_NOT_OWN_BUFFER;
+        
         if (packet->buf_control == TRACE_CTRL_PACKET) {
                 packet->buf_control = TRACE_CTRL_EXTERNAL;

lib/format_dag25.c

@@ -473 +473 @@
         }
 
+        flags |= TRACE_PREP_DO_NOT_OWN_BUFFER;
+        
         if (packet->buf_control == TRACE_CTRL_PACKET) {
                 free(packet->buffer);

lib/format_rt.c

@@ -496 +496 @@
                 libtrace_packet_t *packet, int blocking) {
         uint32_t prep_flags = 0;
-        
+
+        prep_flags |= TRACE_PREP_DO_NOT_OWN_BUFFER;
+
         if (rt_read(libtrace, &packet->buffer, (size_t)RT_INFO->rt_hdr.length, 
                                 blocking) != RT_INFO->rt_hdr.length) {