Metadata / opaque formatting belongs in vpp

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

diff --git a/src/vnet/buffer.h b/src/vnet/buffer.h
index e4167ea..d701e21 100644 (file)
--- a/src/vnet/buffer.h
+++ b/src/vnet/buffer.h
@@ -45,40 +45,40 @@
 /**
  * Flags that are set in the high order bits of ((vlib_buffer*)b)->flags
  */
-#define foreach_vnet_buffer_flag \
-  _( 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")                    \
-  _( 5, SPAN_CLONE, "span-clone")                      \
-  _( 6, LOOP_COUNTER_VALID, 0)                          \
-  _( 7, LOCALLY_ORIGINATED, "local")                   \
-  _( 8, IS_IP4, "ip4")                                 \
-  _( 9, IS_IP6, "ip6")                                 \
-  _(10, OFFLOAD_IP_CKSUM, "offload-ip-cksum")          \
-  _(11, OFFLOAD_TCP_CKSUM, "offload-tcp-cksum")                \
-  _(12, OFFLOAD_UDP_CKSUM, "offload-udp-cksum")                \
-  _(13, IS_NATED, "nated")                             \
-  _(14, L2_HDR_OFFSET_VALID, 0)                                \
-  _(15, L3_HDR_OFFSET_VALID, 0)                                \
-  _(16, L4_HDR_OFFSET_VALID, 0)                                \
-  _(17, FLOW_REPORT, "flow-report")                    \
-  _(18, IS_DVR, "dvr")                                  \
-  _(19, QOS_DATA_VALID, 0)
+#define foreach_vnet_buffer_flag                        \
+  _( 1, L4_CHECKSUM_COMPUTED, "l4-cksum-computed", 1)  \
+  _( 2, L4_CHECKSUM_CORRECT, "l4-cksum-correct", 1)    \
+  _( 3, VLAN_2_DEEP, "vlan-2-deep", 1)                 \
+  _( 4, VLAN_1_DEEP, "vlan-1-deep", 1)                 \
+  _( 5, SPAN_CLONE, "span-clone", 1)                    \
+  _( 6, LOOP_COUNTER_VALID, "loop-counter-valid", 0)    \
+  _( 7, LOCALLY_ORIGINATED, "local", 1)                 \
+  _( 8, IS_IP4, "ip4", 1)                               \
+  _( 9, IS_IP6, "ip6", 1)                               \
+  _(10, OFFLOAD_IP_CKSUM, "offload-ip-cksum", 1)        \
+  _(11, OFFLOAD_TCP_CKSUM, "offload-tcp-cksum", 1)      \
+  _(12, OFFLOAD_UDP_CKSUM, "offload-udp-cksum", 1)      \
+  _(13, IS_NATED, "natted", 1)                          \
+  _(14, L2_HDR_OFFSET_VALID, "l2_hdr_offset_valid", 0)  \
+  _(15, L3_HDR_OFFSET_VALID, "l3_hdr_offset_valid", 0)  \
+  _(16, L4_HDR_OFFSET_VALID, "l4_hdr_offset_valid", 0)  \
+  _(17, FLOW_REPORT, "flow-report", 1)                  \
+  _(18, IS_DVR, "dvr", 1)                               \
+  _(19, QOS_DATA_VALID, "qos-data-valid", 0)
 
 #define VNET_BUFFER_FLAGS_VLAN_BITS \
   (VNET_BUFFER_F_VLAN_1_DEEP | VNET_BUFFER_F_VLAN_2_DEEP)
 
 enum
 {
-#define _(bit, name, v) VNET_BUFFER_F_##name  = (1 << LOG2_VLIB_BUFFER_FLAG_USER(bit)),
+#define _(bit, name, s, v) VNET_BUFFER_F_##name  = (1 << LOG2_VLIB_BUFFER_FLAG_USER(bit)),
   foreach_vnet_buffer_flag
 #undef _
 };
 
 enum
 {
-#define _(bit, name, v) VNET_BUFFER_F_LOG2_##name  = LOG2_VLIB_BUFFER_FLAG_USER(bit),
+#define _(bit, name, s, v) VNET_BUFFER_F_LOG2_##name  = LOG2_VLIB_BUFFER_FLAG_USER(bit),
   foreach_vnet_buffer_flag
 #undef _
 };
@@ -197,8 +197,8 @@ typedef struct
       /* 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
+       * BIER - the number of bytes in the header.
+       *  the len field in the header is not authoritative. It's the
        * value in the table that counts.
        */
       struct
@@ -277,7 +277,6 @@ typedef struct
     struct
     {
       u32 pad[2];              /* do not overlay w/ ip.adj_index[0,1] */
-      u16 header_offset;
       u16 mtu;
       u8 next_index;
       u8 flags;                        //See ip_frag.h
@@ -335,7 +334,7 @@ typedef struct
 } vnet_buffer_opaque_t;
 
 /*
- * The opaque field of the vlib_buffer_t is intepreted as a
+ * 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.
  */
 STATIC_ASSERT (sizeof (vnet_buffer_opaque_t) <=
@@ -364,7 +363,9 @@ typedef struct
   /* Group Based Policy */
   struct
   {
-    u32 src_epg;
+    u8 __unused;
+    u8 flags;
+    u16 src_epg;
   } gbp;
 
   union
@@ -388,7 +389,7 @@ typedef struct
 #define vnet_buffer2(b) ((vnet_buffer_opaque2_t *) (b)->opaque2)
 
 /*
- * The opaque2 field of the vlib_buffer_t is intepreted as a
+ * The opaque2 field of the vlib_buffer_t is interpreted as a
  * vnet_buffer_opaque2_t. Hence it should be big enough to accommodate one.
  */
 STATIC_ASSERT (sizeof (vnet_buffer_opaque2_t) <=