X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fbuffer.h;h=02688e265303cb9b3790fc934a182ed7f3277f3f;hb=4c53313cd7e9b866412ad3e04b2d91ac098c1398;hp=7a4bc245a30096518ad60392cb7816fb45336aa1;hpb=31ed74407643595fdce206e9d7487108fb8b33ab;p=vpp.git

diff --git a/src/vnet/buffer.h b/src/vnet/buffer.h
index 7a4bc245a30..02688e26530 100644
--- a/src/vnet/buffer.h
+++ b/src/vnet/buffer.h
@@ -63,7 +63,8 @@
   _(15, L3_HDR_OFFSET_VALID, 0)				\
   _(16, L4_HDR_OFFSET_VALID, 0)				\
   _(17, FLOW_REPORT, "flow-report")			\
-  _(18, IS_DVR, "dvr")
+  _(18, IS_DVR, "dvr")                                  \
+  _(19, QOS_DATA_VALID, 0)
 
 #define VNET_BUFFER_FLAGS_VLAN_BITS \
   (VNET_BUFFER_F_VLAN_1_DEEP | VNET_BUFFER_F_VLAN_2_DEEP)
@@ -160,15 +161,24 @@ typedef struct
 	} icmp;
 
 	/* reassembly */
-	struct
+	union
 	{
-	  u16 fragment_first;
-	  u16 fragment_last;
-	  u16 range_first;
-	  u16 range_last;
-	  u32 next_range_bi;
-	  u16 ip6_frag_hdr_offset;
-	  u16 estimated_mtu;
+	  /* in/out variables */
+	  struct
+	  {
+	    u32 next_index;	/* index of next node - ignored if "feature" node */
+	    u16 estimated_mtu;	/* estimated MTU calculated during reassembly */
+	  };
+	  /* internal variables used during reassembly */
+	  struct
+	  {
+	    u16 fragment_first;
+	    u16 fragment_last;
+	    u16 range_first;
+	    u16 range_last;
+	    u32 next_range_bi;
+	    u16 ip6_frag_hdr_offset;
+	  };
 	} reass;
       };
 
@@ -186,6 +196,8 @@ typedef struct
       u8 ttl;
       u8 exp;
       u8 first;
+      /* Rewrite length */
+      u32 save_rewrite_length;
       /*
        * BIER - the nubmer of bytes in the header.
        *  the len field inthe header is not authoritative. It's the
@@ -362,16 +374,29 @@ STATIC_ASSERT (sizeof (vnet_buffer_opaque_t) <=
 /* Full cache line (64 bytes) of additional space */
 typedef struct
 {
+  /**
+   * QoS marking data that needs to persist from the recording nodes
+   * (nominally in the ingress path) to the marking node (in the
+   * egress path)
+   */
+  struct
+  {
+    u8 bits;
+    u8 source;
+  } qos;
+
+  u8 __unused[2];
+
   union
   {
-#if VLIB_BUFFER_TRACE_TRAJECTORY > 0
-    /* buffer trajectory tracing */
     struct
     {
+#if VLIB_BUFFER_TRACE_TRAJECTORY > 0
+      /* buffer trajectory tracing */
       u16 *trajectory_trace;
-    };
 #endif
-    u32 unused[12];
+    };
+    u32 unused[11];
   };
 } vnet_buffer_opaque2_t;