Changeset d439067 for lib/libtrace.h.in

Timestamp:

12/10/18 15:59:45 (3 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/libtrace.h.in (modified) (2 diffs)

lib/libtrace.h.in

@@ -577 +577 @@
 } libtrace_ethertype_t;
 
-/** The libtrace packet structure. Applications shouldn't be 
- * meddling around in here 
- */
-typedef struct libtrace_packet_t {
-        struct libtrace_t *trace;       /**< Pointer to the trace */
-        void *header;                   /**< Pointer to the framing header */
-        void *payload;                  /**< Pointer to the link layer */
-        void *buffer;                   /**< Allocated buffer */
-        libtrace_rt_types_t  type;      /**< RT protocol type for the packet */
-        buf_control_t buf_control;      /**< Describes memory ownership */
+typedef struct libtrace_packet_cache {
         int capture_length;             /**< Cached capture length */
         int wire_length;                /**< Cached wire length */
@@ -600 +591 @@
         uint8_t transport_proto;        /**< Cached transport protocol */
         uint32_t l4_remaining;          /**< Cached transport remaining */
+} libtrace_packet_cache_t;
+
+/** The libtrace packet structure. Applications shouldn't be 
+ * meddling around in here 
+ */
+typedef struct libtrace_packet_t {
+        struct libtrace_t *trace;       /**< Pointer to the trace */
+        void *header;                   /**< Pointer to the framing header */
+        void *payload;                  /**< Pointer to the link layer */
+        void *buffer;                   /**< Allocated buffer */
+        libtrace_rt_types_t  type;      /**< RT protocol type for the packet */
+        buf_control_t buf_control;      /**< Describes memory ownership */
+        libtrace_packet_cache_t cached; /**< Cached packet properties / headers */
         uint64_t order; /**< Notes the order of this packet in relation to the input */
         uint64_t hash; /**< A hash of the packet as supplied by the user */