Changeset 7c72e4d for lib/libtrace.h.in

Timestamp:

06/20/07 13:10:40 (14 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:

8ee3dbd

Parents:

f93f0b3

Message:

Add caching of trace_get_capture_length() (since this is used a lot in protocol
decodes to figure out if we captured the full header we're about to decode).

Add caching of the l3 header (avoiding parsing the linktype/l2/l2.5 protocol
headers).

File:

• lib/libtrace.h.in (modified) (4 diffs)

lib/libtrace.h.in

@@ -323 +323 @@
         libtrace_rt_types_t  type;      /**< rt protocol type for the packet */
         buf_control_t buf_control;      /**< who owns the memory */
+        int capture_length;             /**< Cached capture length */
+        void *l3_header;                /**< Cached l3 header */
+        uint16_t l3_ethertype;          /**< Cached l3 ethertype */
 } libtrace_packet_t;
 
@@ -946 +949 @@
 void *trace_get_link(const libtrace_packet_t *packet);
 
-/** get a pointer to the IP header (if any)
- * @param packet        the packet opaque pointer
- *
- * @return a pointer to the IP header, or NULL if there is no IP header
+/** get a pointer to the IPv4 header (if any)
+ * @param packet        the packet opaque pointer
+ *
+ * @return a pointer to the IPv4 header, or NULL if there is no IPv4 header
  */
 DLLEXPORT SIMPLE_FUNCTION
@@ -961 +964 @@
 DLLEXPORT SIMPLE_FUNCTION
 libtrace_ip6_t *trace_get_ip6(libtrace_packet_t *packet);
+
+/** Get a pointer to the layer 3 header.
+ * @param packet                The packet opaque pointer
+ * @param[out] ethertype        The ethertype of the layer 3 header
+ * @param[out] remaining        The amount of space available after this header
+ *                              has been removed.
+ *
+ * @return a pointer to the layer 3 header.
+ * remaining may be NULL, otherwise it will be filled in by the remaining size
+ * of the captured packet.
+ */
+DLLEXPORT SIMPLE_FUNCTION
+void *trace_get_layer3(libtrace_packet_t *packet,
+                uint16_t *ethertype, uint32_t *remaining);
 
 /** Gets a pointer to the transport layer header (if any)
@@ -1312 +1329 @@
  */
 DLLEXPORT SIMPLE_FUNCTION
-size_t trace_get_capture_length(const libtrace_packet_t *packet);
+size_t trace_get_capture_length(libtrace_packet_t *packet);
 
 /** Get the size of the packet as it was seen on the wire.