Changeset e1f3b6b

Timestamp:

11/30/12 16:40:23 (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:

244426f

Parents:

f00c146

Message:

• Fix byte ordering issue when determining the BPF RT type
• Make sure we actually do something if rt_to_pcap_dlt is called with an invalid RT type - also fixed the warning here about not returning at the end of the function

Location:

lib

Files:

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

lib/format_bpf.c

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

lib/linktypes.c

@@ -154 +154 @@
         
         fprintf(stderr, "Error: RT type %u cannot be converted to a pcap DLT\n", rt_type);
-
+        assert(rt_type >= TRACE_RT_DATA_DLT && rt_type < TRACE_RT_DATA_BPF_END);
+        return 0;       /* satisfy warnings */
 }