Changeset 2627439

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 :/

Location:

lib

Files:

• format_bpf.c (modified) (3 diffs)
• libtrace.h.in (modified) (2 diffs)
• linktypes.c (modified) (2 diffs)

lib/format_bpf.c

@@ -383 +383 @@
 {
         uint32_t flags = 0;
+
+        packet->type = bpf_linktype_to_rt(swapl(libtrace, 
+                        FORMATIN(libtrace)->linktype));
         
         /* Read from the BPF interface into our capture buffer */
@@ -417 +420 @@
          * buffer */
         if (bpf_prepare_packet(libtrace, packet, FORMATIN(libtrace)->bufptr,
-                TRACE_RT_DATA_BPF, flags)) {
+                        packet->type, flags)) {
                 return -1;
         }
@@ -438 +441 @@
         /* Convert the linktype that we recorded when we started the trace
          * into a suitable libtrace linktype */
-        return pcap_linktype_to_libtrace(FORMATIN(packet->trace)->linktype);
+        return pcap_linktype_to_libtrace(rt_to_pcap_linktype(packet->type));
 }
 

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;
 

lib/linktypes.c

@@ -164 +164 @@
                 case TRACE_TYPE_ATM:    return TYPE_ATM;
                 case TRACE_TYPE_AAL5:   return TYPE_AAL5;
+                
+                /* Not technically correct! Could be IPv6 packet 
+                 *
+                 * TODO: Maybe we want TRACE_TYPE_RAW_IPV4 and
+                 * TRACE_TYPE_RAW_IPV6 to replace TRACE_TYPE_NONE.
+                 * Still need a good way to figure out how to convert
+                 * TRACE_DLT_LINKTYPE_RAW into the correct type for the
+                 * IP version though :( */
                 case TRACE_TYPE_NONE:   return TYPE_IPV4;
                 /* Unsupported conversions */
@@ -360 +368 @@
                                 return false;
 
-#if 0
-                        switch(ntohs(((libtrace_sll_header_t*)packet->payload)
-                                        ->hatype)) {
-                                case ARPHRD_PPP:
-                                        packet->type=pcap_linktype_to_rt(TRACE_DLT_RAW);
-                                        break;
-                                case ARPHRD_ETHER:
-                                        packet->type=pcap_linktype_to_rt(TRACE_DLT_EN10MB);
-                                        break;
-                                default:
-                                        /* Dunno how to demote this packet */
-                                        return false;
-                        }
-#endif
                         /* Skip the Linux SLL header */
                         packet->payload=(void*)((char*)packet->payload