Changeset 244426f

Timestamp:

12/04/12 10:59:50 (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:

fd87898

Parents:

e1f3b6b

Message:

• Hopefully add the ability to decode BPF over RT

File:

• lib/format_rt.c (modified) (5 diffs)

lib/format_rt.c

@@ -105 +105 @@
         libtrace_t *dummy_pcap;
         libtrace_t *dummy_linux;
+        libtrace_t *dummy_bpf;
 };
 
@@ -198 +199 @@
         RT_INFO->dummy_pcap = NULL;
         RT_INFO->dummy_linux = NULL;
+        RT_INFO->dummy_bpf = NULL;
         RT_INFO->pkt_buffer = NULL;
         RT_INFO->buf_current = NULL;
@@ -290 +292 @@
         if (RT_INFO->dummy_linux)
                 trace_destroy_dead(RT_INFO->dummy_linux);
+
+        if (RT_INFO->dummy_bpf)
+                trace_destroy_dead(RT_INFO->dummy_bpf);
         free(libtrace->format_data);
         return 0;
@@ -402 +407 @@
         }
 
+        if (packet->type > TRACE_RT_DATA_BPF &&
+                        packet->type < TRACE_RT_DATA_DLT_END) {
+
+                if (!RT_INFO->dummy_bpf) {
+                        RT_INFO->dummy_bpf = trace_create_dead("bpf:-");
+                        /* This may fail on a non-BSD machine */
+                        if (trace_is_err(RT_INFO->dummy_bpf)) {
+                                trace_perror(RT_INFO->dummy_bpf, "Creating dead bpf trace");
+                                return -1;
+                        }
+                }
+                packet->trace = RT_INFO->dummy_bpf;
+                return 0;
+        }
+
         switch (packet->type) {
                 case TRACE_RT_DUCK_2_4:
@@ -419 +439 @@
                         if (!RT_INFO->dummy_linux) {
                                 RT_INFO->dummy_linux = trace_create_dead("int:");
+                                /* This may fail on a non-Linux machine */
+                                if (trace_is_err(RT_INFO->dummy_linux)) {
+                                        trace_perror(RT_INFO->dummy_linux, "Creating dead bpf trace");
+                                        return -1;
+                                }
                         }
                         packet->trace = RT_INFO->dummy_linux;