Changeset fe4940e for lib

Timestamp:

10/16/18 15:53:16 (2 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

develop, master, ringperformance

Children:

f3e1f19

Parents:

6a2f037

Message:

Cache packet framing length to avoid multiple calculations

Also when stripping vlan etc. headers, don't try to memmove if zero
bytes are going to be moved.

Location:

lib

Files:

• libtrace.h.in (modified) (1 diff)
• protocols_l2.c (modified) (1 diff)

lib/libtrace.h.in

@@ -551 +551 @@
         int wire_length;                /**< Cached wire length */
         int payload_length;             /**< Cached payload length */
+        int framing_length;             /**< Cached framing length */
         void *l2_header;                /**< Cached link header */
         libtrace_linktype_t link_type;  /**< Cached link type */

lib/protocols_l2.c

@@ -174 +174 @@
         }
 
-        if (nextpayload != NULL) {
+        if (nextpayload != NULL && removed > 0) {
 
                 ethernet->ether_type = ntohs(finalethertype);