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 0cea4d5..cd26b8a 100644 (file)
--- a/src/vnet/ipip/node.c
+++ b/src/vnet/ipip/node.c
@@ -158,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)