Changeset 0ff6ddf for lib/linktypes.c

Timestamp:

06/06/06 17:32:24 (15 years ago)

Author:

Perry Lorier <perry@…>

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:

b0acff7

Parents:

41f22e4

Message:

Add demotion of packets from LINUX_SLL to ethernet when writing ERF packets.
We don't need the extra header to store the direction information, and erf
doesn't have a type for linux-sll /anyway/.

This also adds a test which takes a packet, promotes it and demotes it again
which should catch direction related bugs

Closes: #21

File:

• lib/linktypes.c (modified) (1 diff)

lib/linktypes.c

@@ -154 +154 @@
         }
 }
+
+/* Try and simplify the packet one step, kinda the opposite to promote_packet
+ *
+ * returns true if demotion was possible, false if not.
+ */
+bool demote_packet(libtrace_packet_t *packet)
+{
+        switch(trace_get_link_type(packet)) {
+                case TRACE_TYPE_LINUX_SLL:
+                        switch(((libtrace_sll_header_t*)packet->payload)
+                                        ->hatype) {
+                                case ARPHRD_PPP:
+                                        packet->type=pcap_dlt_to_rt(DLT_NULL);
+                                        break;
+                                case ARPHRD_ETHER:
+                                        packet->type=pcap_dlt_to_rt(DLT_EN10MB);
+                                        break;
+                                default:
+                                        /* Dunno how to demote this packet */
+                                        return false;
+                        }
+                        packet->payload=(void*)((char*)packet->payload
+                                        +sizeof(libtrace_sll_header_t));
+                        trace_set_capture_length(packet,
+                                trace_get_capture_length(packet)
+                                        -sizeof(libtrace_sll_header_t));
+                        break;
+                default:
+                        return false;
+        }
+}