plugins: odp: ipsec: Del GRE as it was not tested 52/10652/1
authorSzymon Sliwa <[email protected]>
Mon, 19 Feb 2018 11:52:16 +0000 (12:52 +0100)
committerSzymon Sliwa <[email protected]>
Mon, 19 Feb 2018 16:47:48 +0000 (17:47 +0100)
In case of trying to add GRE to the IPsec implementation, be careful as the
post_crypto and ipsec fields of the vnet_buffer union overlap, and both are
needed for the ODP based ipsec with GRE.

Change-Id: If20fa9d78f2879264c02922f21bc204fba1ab616
Signed-off-by: Szymon Sliwa <[email protected]>
src/plugins/odp/ipsec/esp_decrypt.c

index 3e07676..814c52b 100644 (file)
@@ -28,8 +28,7 @@
 #define foreach_esp_decrypt_next                \
 _(DROP, "error-drop")                           \
 _(IP4_INPUT, "ip4-input")                       \
-_(IP6_INPUT, "ip6-input")                       \
-_(IPSEC_GRE_INPUT, "ipsec-gre-input")
+_(IP6_INPUT, "ip6-input")
 
 #define _(v, s) ESP_DECRYPT_NEXT_##v,
 typedef enum
@@ -404,12 +403,6 @@ esp_decrypt_node_fn (vlib_main_t * vm,
                    }
                }
 
-             /* for IPSec-GRE tunnel next node is ipsec-gre-input */
-             if (PREDICT_FALSE
-                 ((vnet_buffer (b0)->ipsec.flags) &
-                  IPSEC_FLAG_IPSEC_GRE_TUNNEL))
-               next0 = ESP_DECRYPT_NEXT_IPSEC_GRE_INPUT;
-
              vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
 
              vnet_buffer (b0)->post_crypto.next_index = next0;