Changeset 2627439 for lib/libtrace.h.in

Timestamp:

11/30/12 15:04:47 (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:

f00c146

Parents:

f240823

Message:

• Created separate RT types for each combination of BPF + DLT - BPF doesn't store the linktype in the packet at all, so this has to be included in the RT type :/

File:

• lib/libtrace.h.in (modified) (2 diffs)

lib/libtrace.h.in

@@ -345 +345 @@
         TRACE_RT_DATA_LINUX_NATIVE=TRACE_RT_DATA_SIMPLE+TRACE_FORMAT_LINUX_NATIVE,
         /** RT is encapsulating a BSD native capture record */
-        TRACE_RT_DATA_BPF       =TRACE_RT_DATA_SIMPLE+TRACE_FORMAT_BPF,
+        //TRACE_RT_DATA_BPF       =TRACE_RT_DATA_SIMPLE+TRACE_FORMAT_BPF,
         /** RT is encapsulating a TSH capture record */
         TRACE_RT_DATA_TSH       =TRACE_RT_DATA_SIMPLE+TRACE_FORMAT_TSH,
@@ -377 +377 @@
          * encapsulation */
         TRACE_RT_DATA_DLT_END           = 2999,
+        /** BPF does not store the linktype with the packet, so we need a
+         * separate RT type for each supported DLT. This value represents the
+         * starting point */
+        TRACE_RT_DATA_BPF               = 3000,
+
+        TRACE_RT_BPF_NULL               = TRACE_RT_DATA_BPF+TRACE_DLT_NULL,
+        TRACE_RT_BPF_EN10MB             = TRACE_RT_DATA_BPF+TRACE_DLT_EN10MB,
+        TRACE_RT_BPF_IEEE802_11         = TRACE_RT_DATA_BPF+TRACE_DLT_IEEE802_11,
+        TRACE_RT_BPF_PFLOG              =TRACE_RT_DATA_BPF+TRACE_DLT_PFLOG,
+        TRACE_RT_BPF_ATM_RFC1483        =TRACE_RT_DATA_BPF+TRACE_DLT_ATM_RFC1483,
+
+        TRACE_RT_DATA_BPF_END           = 3999,
         /** Unused value marking the end of the valid range for all RT packet
          * types */
-        TRACE_RT_LAST                   = 3000
+        TRACE_RT_LAST                   = 4000
 } libtrace_rt_types_t;