Changeset f00c146

Timestamp:

11/30/12 16:24:15 (8 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:

e1f3b6b

Parents:

2627439

Message:

• Fix build errors with format_bpf.c

Location:

lib

Files:

• format_bpf.c (modified) (1 diff)
• libtrace_int.h (modified) (1 diff)
• linktypes.c (modified) (1 diff)

lib/format_bpf.c

@@ -384 +384 @@
         uint32_t flags = 0;
 
-        packet->type = bpf_linktype_to_rt(swapl(libtrace, 
-                        FORMATIN(libtrace)->linktype));
+        packet->type = bpf_linktype_to_rt(ntohs(FORMATIN(libtrace)->linktype));
         
         /* Read from the BPF interface into our capture buffer */

lib/libtrace_int.h

@@ -790 +790 @@
 libtrace_dlt_t rt_to_pcap_linktype(libtrace_rt_types_t rt_type);
 
+/** Converts a PCAP DLT into an RT protocol type for the BPF format.
+ *
+ * @param linktype      The PCAP DLT to be converted
+ * @return The RT type that is equivalent to the provided DLT for BPF
+ */
+libtrace_rt_types_t bpf_linktype_to_rt(libtrace_dlt_t linktype);
+
 /** Converts an ERF type into a libtrace link type.
  *

lib/linktypes.c

@@ -137 +137 @@
 }
 
+libtrace_rt_types_t bpf_linktype_to_rt(libtrace_dlt_t linktype) {
+        return pcap_dlt_to_pcap_linktype(linktype) + TRACE_RT_DATA_BPF;
+
+}
+
 libtrace_dlt_t rt_to_pcap_linktype(libtrace_rt_types_t rt_type)
 {
-        assert(rt_type >= TRACE_RT_DATA_DLT);
-        return rt_type - TRACE_RT_DATA_DLT;
+        
+        if (rt_type >= TRACE_RT_DATA_DLT && rt_type < TRACE_RT_DATA_DLT_END) {
+                /* RT type is in the pcap range */
+                return rt_type - TRACE_RT_DATA_DLT;
+        } 
+        else if (rt_type >= TRACE_RT_DATA_BPF && rt_type < TRACE_RT_DATA_BPF_END) {
+                return rt_type - TRACE_RT_DATA_BPF;
+        }
+        
+        fprintf(stderr, "Error: RT type %u cannot be converted to a pcap DLT\n", rt_type);
+
 }