tcp: IPv6 flow label support

[vpp.git] / src / vnet / ip / ip6.h

diff --git a/src/vnet/ip/ip6.h b/src/vnet/ip/ip6.h
index 810fd70..28b1af7 100644 (file)
--- a/src/vnet/ip/ip6.h
+++ b/src/vnet/ip/ip6.h
@@ -655,21 +655,23 @@ void ip6_hbh_set_next_override (uword next);
  * @param src - source IP
  * @param dst - destination IP
  * @param prot - payload proto
+ * @param flow_label - flow label
  *
  * @return - pointer to start of IP header
  */
 always_inline void *
-vlib_buffer_push_ip6 (vlib_main_t * vm, vlib_buffer_t * b,
-                     ip6_address_t * src, ip6_address_t * dst, int proto)
+vlib_buffer_push_ip6_custom (vlib_main_t * vm, vlib_buffer_t * b,
+                            ip6_address_t * src, ip6_address_t * dst,
+                            int proto, u32 flow_label)
 {
   ip6_header_t *ip6h;
   u16 payload_length;
 
   /* make some room */
   ip6h = vlib_buffer_push_uninit (b, sizeof (ip6_header_t));
-
+  ASSERT (flow_label < 1 << 20);
   ip6h->ip_version_traffic_class_and_flow_label =
-    clib_host_to_net_u32 (0x6 << 28);
+    clib_host_to_net_u32 ((0x6 << 28) | flow_label);
 
   /* calculate ip6 payload length */
   payload_length = vlib_buffer_length_in_chain (vm, b);
@@ -683,11 +685,31 @@ vlib_buffer_push_ip6 (vlib_main_t * vm, vlib_buffer_t * b,
                    sizeof (ip6h->src_address));
   clib_memcpy_fast (ip6h->dst_address.as_u8, dst->as_u8,
                    sizeof (ip6h->src_address));
-  b->flags |= VNET_BUFFER_F_IS_IP6;
+  vnet_buffer (b)->l3_hdr_offset = (u8 *) ip6h - b->data;
+  b->flags |= VNET_BUFFER_F_IS_IP6 | VNET_BUFFER_F_L3_HDR_OFFSET_VALID;
 
   return ip6h;
 }
 
+/**
+ * Push IPv6 header to buffer
+ *
+ * @param vm - vlib_main
+ * @param b - buffer to write the header to
+ * @param src - source IP
+ * @param dst - destination IP
+ * @param prot - payload proto
+ *
+ * @return - pointer to start of IP header
+ */
+always_inline void *
+vlib_buffer_push_ip6 (vlib_main_t * vm, vlib_buffer_t * b,
+                     ip6_address_t * src, ip6_address_t * dst, int proto)
+{
+  return vlib_buffer_push_ip6_custom (vm, b, src, dst, proto,
+                                     0 /* flow label */ );
+
+}
 #endif /* included_ip_ip6_h */
 
 /*