Changeset d439067 for lib/protocols_transport.c

Timestamp:

12/10/18 15:59:45 (2 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

develop

Children:

10fd24b

Parents:

418c78d

Message:

Move packet cached fields into a distinct structure.

This will help tidy up the packet structure a little, as well as
simplify the cache clearing process (and maybe even speed it up
a little).

File:

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

lib/protocols_transport.c

@@ -64 +64 @@
 
         /* Just use the cached length if we can */
-        if (packet->payload_length != -1)
-                return packet->payload_length;  
+        if (packet->cached.payload_length != -1)
+                return packet->cached.payload_length;   
 
         /* Set to zero so that we can return early without having to 
          * worry about forgetting to update the cached value */
-        ((libtrace_packet_t *)packet)->payload_length = 0;
+        ((libtrace_packet_t *)packet)->cached.payload_length = 0;
         layer = trace_get_layer3(packet, &ethertype, &rem);
         if (!layer)
@@ -162 +162 @@
         }
 
-        ((libtrace_packet_t *)packet)->payload_length = len;
+        ((libtrace_packet_t *)packet)->cached.payload_length = len;
         return len;
 
@@ -181 +181 @@
         if (!remaining) remaining=&dummy_remaining;
 
-        if (packet->l4_header) {
+        if (packet->cached.l4_header) {
                 /*
                 void *link;
@@ -189 +189 @@
                         return NULL;
                 */
-                *proto = packet->transport_proto;
-                /* *remaining -= (packet->l4_header - link); */
-                *remaining = packet->l4_remaining;
-                return packet->l4_header;
+                *proto = packet->cached.transport_proto;
+                *remaining = packet->cached.l4_remaining;
+                return packet->cached.l4_header;
         }
 
@@ -221 +220 @@
         }
 
-        ((libtrace_packet_t *)packet)->transport_proto = *proto;
-        ((libtrace_packet_t *)packet)->l4_header = transport;
-        ((libtrace_packet_t *)packet)->l4_remaining = *remaining;
+        ((libtrace_packet_t *)packet)->cached.transport_proto = *proto;
+        ((libtrace_packet_t *)packet)->cached.l4_header = transport;
+        ((libtrace_packet_t *)packet)->cached.l4_remaining = *remaining;