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 1a57c41..28b1af7 100644 (file)
--- a/src/vnet/ip/ip6.h
+++ b/src/vnet/ip/ip6.h
@@ -122,7 +122,7 @@ typedef enum ip6_fib_table_instance_type_t_
 {
     /**
      * This table stores the routes that are used to forward traffic.
-     * The key is the prefix, the result the adjacnecy to forward on.
+     * The key is the prefix, the result the adjacency to forward on.
      */
   IP6_FIB_TABLE_FWDING,
     /**
@@ -137,7 +137,7 @@ typedef enum ip6_fib_table_instance_type_t_
 #define IP6_FIB_NUM_TABLES (IP6_FIB_TABLE_NON_FWDING+1)
 
 /**
- * A represenation of a single IP6 table
+ * A representation of a single IP6 table
  */
 typedef struct ip6_fib_table_instance_t_
 {
@@ -151,7 +151,7 @@ typedef struct ip6_fib_table_instance_t_
 } ip6_fib_table_instance_t;
 
 /**
- * A represenation of a single IP6 mfib table
+ * A representation of a single IP6 mfib table
  */
 typedef struct ip6_mfib_table_instance_t_
 {
@@ -388,6 +388,8 @@ u16 ip6_tcp_udp_icmp_compute_checksum (vlib_main_t * vm, vlib_buffer_t * p0,
                                       int *bogus_lengthp);
 
 void ip6_register_protocol (u32 protocol, u32 node_index);
+void ip6_unregister_protocol (u32 protocol);
+void ip6_local_hop_by_hop_register_protocol (u32 protocol, u32 node_index);
 
 serialize_function_t serialize_vnet_ip6_main, unserialize_vnet_ip6_main;
 
@@ -466,6 +468,8 @@ u32 ip6_tcp_udp_icmp_validate_checksum (vlib_main_t * vm, vlib_buffer_t * p0);
 void ip6_punt_policer_add_del (u8 is_add, u32 policer_index);
 void ip6_punt_redirect_add (u32 rx_sw_if_index,
                            u32 tx_sw_if_index, ip46_address_t * nh);
+void ip6_punt_redirect_add_paths (u32 rx_sw_if_index,
+                                 fib_route_path_t * paths);
 void ip6_punt_redirect_del (u32 rx_sw_if_index);
 
 int vnet_set_ip6_classify_intfc (vlib_main_t * vm, u32 sw_if_index,
@@ -651,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);
@@ -679,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 */
 
 /*