X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fbuffer.h;h=529356122777845b5d9ec565fe4d0c9ce54cf436;hb=c87fbb417;hp=708e399047d1a6c8471fd30e9979115bcdf6835e;hpb=de34c35fc73226943538149fae9dbc5cfbdc6e75;p=vpp.git

diff --git a/src/vnet/buffer.h b/src/vnet/buffer.h
index 708e399047d..52935612277 100644
--- a/src/vnet/buffer.h
+++ b/src/vnet/buffer.h
@@ -168,7 +168,7 @@ typedef struct
 	  };
 
 	  /* Rewrite length */
-	  u32 save_rewrite_length;
+	  u8 save_rewrite_length;
 
 	  /* MFIB RPF ID */
 	  u32 rpf_id;
@@ -185,8 +185,8 @@ typedef struct
 	/* reassembly */
 	union
 	{
-	  /* group input/handoff as handoff is done before input is consumed,
-	   * this way we can handoff while keeping input variables intact */
+	  /* group input/output to simplify the code, this way
+	   * we can handoff while keeping input variables intact */
 	  struct
 	  {
 	    /* input variables */
@@ -209,9 +209,14 @@ typedef struct
 	      /* shallow virtual reassembly output variables */
 	      struct
 	      {
-		u8 ip_proto;	/* protocol in ip header */
 		u16 l4_src_port;	/* tcp/udp/icmp src port */
 		u16 l4_dst_port;	/* tcp/udp/icmp dst port */
+		u32 tcp_ack_number;
+		u8 save_rewrite_length;
+		u8 ip_proto;	/* protocol in ip header */
+		u8 icmp_type_or_tcp_flags;
+		u8 is_non_first_fragment;
+		u32 tcp_seq_number;
 	      };
 	      /* full reassembly output variables */
 	      struct
@@ -246,8 +251,12 @@ typedef struct
       u8 ttl;
       u8 exp;
       u8 first;
+      u8 pyld_proto:3;		/* dpo_proto_t */
+      u8 rsvd:5;
       /* Rewrite length */
-      u32 save_rewrite_length;
+      u8 save_rewrite_length;
+      /* Save the mpls header length including all label stack */
+      u8 mpls_hdr_length;
       /*
        * BIER - the number of bytes in the header.
        *  the len field in the header is not authoritative. It's the
@@ -375,6 +384,28 @@ typedef struct
   };
 } vnet_buffer_opaque_t;
 
+#define VNET_REWRITE_TOTAL_BYTES (VLIB_BUFFER_PRE_DATA_SIZE)
+
+STATIC_ASSERT (STRUCT_SIZE_OF (vnet_buffer_opaque_t, ip.save_rewrite_length)
+	       == STRUCT_SIZE_OF (vnet_buffer_opaque_t,
+				  ip.reass.save_rewrite_length)
+	       && STRUCT_SIZE_OF (vnet_buffer_opaque_t,
+				  ip.reass.save_rewrite_length) ==
+	       STRUCT_SIZE_OF (vnet_buffer_opaque_t, mpls.save_rewrite_length)
+	       && STRUCT_SIZE_OF (vnet_buffer_opaque_t,
+				  mpls.save_rewrite_length) == 1
+	       && VNET_REWRITE_TOTAL_BYTES < UINT8_MAX,
+	       "save_rewrite_length member must be able to hold the max value of rewrite length");
+
+STATIC_ASSERT (STRUCT_OFFSET_OF (vnet_buffer_opaque_t, ip.save_rewrite_length)
+	       == STRUCT_OFFSET_OF (vnet_buffer_opaque_t,
+				    ip.reass.save_rewrite_length)
+	       && STRUCT_OFFSET_OF (vnet_buffer_opaque_t,
+				    mpls.save_rewrite_length) ==
+	       STRUCT_OFFSET_OF (vnet_buffer_opaque_t,
+				 ip.reass.save_rewrite_length),
+	       "save_rewrite_length must be aligned so that reass doesn't overwrite it");
+
 /*
  * The opaque field of the vlib_buffer_t is interpreted as a
  * vnet_buffer_opaque_t. Hence it should be big enough to accommodate one.