VPP-1024: rewrite buffer trajectory tracer

[vpp.git] / src / vnet / buffer.h

diff --git a/src/vnet/buffer.h b/src/vnet/buffer.h
index 7dfc6b9..0453288 100644 (file)
--- a/src/vnet/buffer.h
+++ b/src/vnet/buffer.h
@@ -54,7 +54,8 @@
   _( 9, IS_IP6)                                                \
   _(10, OFFLOAD_IP_CKSUM)                              \
   _(11, OFFLOAD_TCP_CKSUM)                             \
-  _(12, OFFLOAD_UDP_CKSUM)
+  _(12, OFFLOAD_UDP_CKSUM)                              \
+  _(13, IS_NATED)
 
 #define VNET_BUFFER_FLAGS_VLAN_BITS \
   (VNET_BUFFER_F_VLAN_1_DEEP | VNET_BUFFER_F_VLAN_2_DEEP)
@@ -125,8 +126,14 @@ typedef struct
             protocol and ports. */
          u32 flow_hash;
 
-         /* next protocol */
-         u32 save_protocol;
+         union
+         {
+           /* next protocol */
+           u32 save_protocol;
+
+           /* Hint for transport protocols */
+           u32 fib_index;
+         };
 
          /* Rewrite length */
          u32 save_rewrite_length;
@@ -173,6 +180,7 @@ typedef struct
       u8 l2_len;               /* ethernet header length */
       u8 shg;                  /* split-horizon group */
       u16 l2fib_sn;            /* l2fib bd/int seq_num */
+      u8 bd_age;               /* aging enabled */
     } l2;
 
     /* l2tpv3 softwire encap, only valid there */
@@ -309,9 +317,26 @@ typedef struct
 {
   union
   {
+#if VLIB_BUFFER_TRACE_TRAJECTORY > 0
+    /* buffer trajectory tracing */
+    struct
+    {
+      u16 *trajectory_trace;
+    };
+#endif
+    u32 unused[12];
   };
 } vnet_buffer_opaque2_t;
 
+#define vnet_buffer2(b) ((vnet_buffer_opaque2_t *) (b)->opaque2)
+
+/*
+ * The opaque2 field of the vlib_buffer_t is intepreted as a
+ * vnet_buffer_opaque2_t. Hence it should be big enough to accommodate one.
+ */
+STATIC_ASSERT (sizeof (vnet_buffer_opaque2_t) <=
+              STRUCT_SIZE_OF (vlib_buffer_t, opaque2),
+              "VNET buffer opaque2 meta-data too large for vlib_buffer");
 
 
 #endif /* included_vnet_buffer_h */