Changeset 84d137d

Timestamp:

08/04/15 13:57:38 (7 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, 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:

0277ab8

Parents:

7428ab2

Message:

Attempt at a faster stripping approach

Unfortunately, the stripping is more indiscriminate. We won't be able
to choose whether we just want VLAN or MPLS stripped -- it'll all get
thrown away, but this is probably the most common use case anyway.

File:

• lib/protocols_l2.c (modified) (7 diffs)

lib/protocols_l2.c

@@ -109 +109 @@
         uint32_t remaining;
         libtrace_packet_t *copy;
-        void *payload;
+        char *payload;
         uint16_t finalethertype = 0;
         uint16_t caplen, removed = 0;
@@ -145 +145 @@
         }
 
+        payload = (char *)trace_get_layer3(packet, &ethertype, &remaining);
+        caplen = trace_get_capture_length(packet);
+        dest = ((char *)ethernet) + sizeof(libtrace_ether_t);
+
+        if (payload == NULL || remaining == 0)
+                return packet;
+
+        if (payload == dest)
+                return packet;
+
+        ethernet->ether_type = ntohs(ethertype);
+        trace_set_capture_length(packet, caplen - (payload - dest));
+        memmove(payload - (dest - (char *)packet->payload), packet->payload, 
+                        (dest - (char *)packet->payload));
+        packet->payload = payload - (dest - (char *)packet->payload);
+        packet->l2_header = NULL;
+        packet->l3_header = NULL;
+        packet->l4_header = NULL;
+        
+        /*
         payload = trace_get_payload_from_layer2(ethernet, linktype,
                         &ethertype, &remaining);
 
-        dest = ((char *)ethernet) + sizeof(libtrace_ether_t);
-        caplen = trace_get_capture_length(packet);
         while (!done) {
 
@@ -164 +182 @@
                         {
                                 removed += (oldrem - remaining);
-                                memmove(dest, payload, remaining);
-                                payload = dest;
+                                //memmove(dest, payload, remaining);
+                                //payload = dest;
 
                         } else {
@@ -171 +189 @@
                                         finalethertype = TRACE_ETHERTYPE_8021Q;
                                 }
-                                dest = payload;
+                                //dest = payload;
                         }
                         break;
@@ -181 +199 @@
                         {
                                 removed += (oldrem - remaining);
-                                memmove(dest, payload, remaining);
-                                payload = dest;
+                                //memmove(dest, payload, remaining);
+                                //payload = dest;
 
                         } else {
@@ -188 +206 @@
                                         finalethertype = TRACE_ETHERTYPE_MPLS;
                                 }
-                                dest = payload;
+                                //dest = payload;
                         }
                         break;
@@ -201 +219 @@
                 }
         }
-
+                */
         /* Update the preceding headers to match the new packet contents */
-        ethernet->ether_type = ntohs(finalethertype);
-        trace_set_capture_length(packet, caplen - removed);
         return packet;