ipip: Tunnel flags controlling copying data to/from payload/encap

[vpp.git] / src / vnet / ipip / node.c

diff --git a/src/vnet/ipip/node.c b/src/vnet/ipip/node.c
index d55b91a..cd26b8a 100644 (file)
--- a/src/vnet/ipip/node.c
+++ b/src/vnet/ipip/node.c
@@ -45,7 +45,7 @@ typedef struct
   u8 is_ipv6;
 } ipip_rx_trace_t;
 
-u8 *
+static u8 *
 format_ipip_rx_trace (u8 * s, va_list * args)
 {
   CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
@@ -99,6 +99,14 @@ ipip_input (vlib_main_t * vm, vlib_node_runtime_t * node,
          if (is_ipv6)
            {
              ip60 = vlib_buffer_get_current (b0);
+             /* Check for outer fragmentation */
+             if (ip60->protocol == IP_PROTOCOL_IPV6_FRAGMENTATION)
+               {
+                 next0 = IPIP_INPUT_NEXT_DROP;
+                 b0->error = node->errors[IPIP_ERROR_FRAGMENTED_PACKET];
+                 goto drop;
+               }
+
              vlib_buffer_advance (b0, sizeof (*ip60));
              ip_set (&src0, &ip60->src_address, false);
              ip_set (&dst0, &ip60->dst_address, false);
@@ -108,6 +116,14 @@ ipip_input (vlib_main_t * vm, vlib_node_runtime_t * node,
          else
            {
              ip40 = vlib_buffer_get_current (b0);
+             /* Check for outer fragmentation */
+             if (ip40->flags_and_fragment_offset &
+                 clib_host_to_net_u16 (IP4_HEADER_FLAG_MORE_FRAGMENTS))
+               {
+                 next0 = IPIP_INPUT_NEXT_DROP;
+                 b0->error = node->errors[IPIP_ERROR_FRAGMENTED_PACKET];
+                 goto drop;
+               }
              vlib_buffer_advance (b0, sizeof (*ip40));
              ip_set (&src0, &ip40->src_address, true);
              ip_set (&dst0, &ip40->dst_address, true);
@@ -142,9 +158,33 @@ ipip_input (vlib_main_t * vm, vlib_node_runtime_t * node,
          vnet_buffer (b0)->sw_if_index[VLIB_RX] = tunnel_sw_if_index;
 
          if (inner_protocol0 == IP_PROTOCOL_IPV6)
-           next0 = IPIP_INPUT_NEXT_IP6_INPUT;
+           {
+             next0 = IPIP_INPUT_NEXT_IP6_INPUT;
+
+             if (t0->flags & IPIP_TUNNEL_FLAG_DECAP_COPY_ECN)
+               {
+                 if (is_ipv6)
+                   ip6_set_ecn_network_order ((ip60 + 1),
+                                              ip6_ecn_network_order (ip60));
+                 else
+                   ip6_set_ecn_network_order ((ip6_header_t *) (ip40 + 1),
+                                              ip4_header_get_ecn (ip40));
+               }
+           }
          else if (inner_protocol0 == IP_PROTOCOL_IP_IN_IP)
-           next0 = IPIP_INPUT_NEXT_IP4_INPUT;
+           {
+             next0 = IPIP_INPUT_NEXT_IP4_INPUT;
+             if (t0->flags & IPIP_TUNNEL_FLAG_DECAP_COPY_ECN)
+               {
+                 if (is_ipv6)
+                   ip4_header_set_ecn_w_chksum ((ip4_header_t *) (ip60 + 1),
+                                                ip6_ecn_network_order
+                                                (ip60));
+                 else
+                   ip4_header_set_ecn_w_chksum (ip40 + 1,
+                                                ip4_header_get_ecn (ip40));
+               }
+           }
 
          if (!is_ipv6 && t0->mode == IPIP_MODE_6RD
              && t0->sixrd.security_check)
@@ -200,16 +240,14 @@ ipip_input (vlib_main_t * vm, vlib_node_runtime_t * node,
   return from_frame->n_vectors;
 }
 
-static uword
-ipip4_input (vlib_main_t * vm, vlib_node_runtime_t * node,
-            vlib_frame_t * from_frame)
+VLIB_NODE_FN (ipip4_input_node) (vlib_main_t * vm, vlib_node_runtime_t * node,
+                                vlib_frame_t * from_frame)
 {
   return ipip_input (vm, node, from_frame, /* is_ip6 */ false);
 }
 
-static uword
-ipip6_input (vlib_main_t * vm, vlib_node_runtime_t * node,
-            vlib_frame_t * from_frame)
+VLIB_NODE_FN (ipip6_input_node) (vlib_main_t * vm, vlib_node_runtime_t * node,
+                                vlib_frame_t * from_frame)
 {
   return ipip_input (vm, node, from_frame, /* is_ip6 */ true);
 }
@@ -222,7 +260,6 @@ static char *ipip_error_strings[] = {
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE(ipip4_input_node) = {
-    .function = ipip4_input,
     .name = "ipip4-input",
     /* Takes a vector of packets. */
     .vector_size = sizeof(u32),
@@ -239,7 +276,6 @@ VLIB_REGISTER_NODE(ipip4_input_node) = {
 };
 
 VLIB_REGISTER_NODE(ipip6_input_node) = {
-    .function = ipip6_input,
     .name = "ipip6-input",
     /* Takes a vector of packets. */
     .vector_size = sizeof(u32),
@@ -255,8 +291,6 @@ VLIB_REGISTER_NODE(ipip6_input_node) = {
     .format_trace = format_ipip_rx_trace,
 };
 
-VLIB_NODE_FUNCTION_MULTIARCH(ipip4_input_node, ipip4_input)
-VLIB_NODE_FUNCTION_MULTIARCH(ipip6_input_node, ipip6_input)
 /* *INDENT-ON* */
 
 /*