X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fbuffer.h;h=5d7273aa04fe0afd7288af3ee207e085a55b6be6;hb=75e7d13;hp=8cb55454462093cf0ecf298c0d5d8b9489dafc4f;hpb=9128637ee8f7b0d903551f165a1447d427e8dd19;p=vpp.git

diff --git a/src/vnet/buffer.h b/src/vnet/buffer.h
index 8cb55454462..5d7273aa04f 100644
--- a/src/vnet/buffer.h
+++ b/src/vnet/buffer.h
@@ -42,12 +42,15 @@
 
 #include <vlib/vlib.h>
 
+/**
+ * Flags that are set in the high order bits of ((vlib_buffer*)b)->flags
+ */
 #define foreach_vnet_buffer_field \
   _( 1, L4_CHECKSUM_COMPUTED, "l4-cksum-computed")	\
   _( 2, L4_CHECKSUM_CORRECT, "l4-cksum-correct")	\
   _( 3, VLAN_2_DEEP, "vlan-2-deep")			\
   _( 4, VLAN_1_DEEP, "vlan-1-deep")			\
-  _( 8, SPAN_CLONE, "span-clone")			\
+  _( 5, SPAN_CLONE, "span-clone")			\
   _( 6, HANDOFF_NEXT_VALID, "handoff-next-valid")	\
   _( 7, LOCALLY_ORIGINATED, "local")			\
   _( 8, IS_IP4, "ip4")					\
@@ -77,6 +80,26 @@ enum
 #undef _
 };
 
+/**
+ * @brief Flags set in ((vnet_buffer(b)->flags
+ */
+#define foreach_vnet_opaque_flag \
+  _( 1, IS_DVR, "DVR-processed")
+
+enum
+{
+#define _(bit, name, v) VNET_OPAQUE_F_##name  = (1 << bit),
+  foreach_vnet_opaque_flag
+#undef _
+};
+
+enum
+{
+#define _(bit, name, v) VNET_OPAQUE_F_LOG2_##name  = bit,
+  foreach_vnet_opaque_flag
+#undef _
+};
+
 
 #define foreach_buffer_opaque_union_subtype     \
 _(ip)                                           \
@@ -111,6 +134,7 @@ typedef struct
   i16 l2_hdr_offset;
   i16 l3_hdr_offset;
   i16 l4_hdr_offset;
+  u16 flags;
 
   union
   {
@@ -153,6 +177,18 @@ typedef struct
 	  u8 code;
 	  u32 data;
 	} icmp;
+
+	/* reassembly */
+	struct
+	{
+	  u16 fragment_first;
+	  u16 fragment_last;
+	  u16 range_first;
+	  u16 range_last;
+	  u32 next_range_bi;
+	  u16 ip6_frag_hdr_offset;
+	  u16 estimated_mtu;
+	} reass;
       };
 
     } ip;
@@ -265,6 +301,7 @@ typedef struct
     /* IP Fragmentation */
     struct
     {
+      u32 pad[2];		/* do not overlay w/ ip.adj_index[0,1] */
       u16 header_offset;
       u16 mtu;
       u8 next_index;
@@ -305,6 +342,19 @@ typedef struct
       u8 flags;
     } tcp;
 
+    /* SCTP */
+    struct
+    {
+      u32 connection_index;
+      u16 sid; /**< Stream ID */
+      u16 ssn; /**< Stream Sequence Number */
+      u32 tsn; /**< Transmission Sequence Number */
+      u16 hdr_offset;		/**< offset relative to ip hdr */
+      u16 data_offset;		/**< offset relative to ip hdr */
+      u16 data_len;		/**< data len */
+      u8 flags;
+    } sctp;
+
     /* SNAT */
     struct
     {