Revert "ipsec: VPP-1316 calculate IP/TCP/UDP inner checksums"

[vpp.git] / src / vnet / ipsec / ipsec_output.c

diff --git a/src/vnet/ipsec/ipsec_output.c b/src/vnet/ipsec/ipsec_output.c
index 9797789..4bfbf60 100644 (file)
--- a/src/vnet/ipsec/ipsec_output.c
+++ b/src/vnet/ipsec/ipsec_output.c
@@ -21,26 +21,7 @@
 
 #include <vnet/ipsec/ipsec.h>
 
-#if DPDK_CRYPTO==1
-#define ESP_NODE "dpdk-esp-encrypt"
-#else
-#define ESP_NODE "esp-encrypt"
-#endif
-
-#if IPSEC > 0
-
-#define foreach_ipsec_output_next                \
-_(DROP, "error-drop")                            \
-_(ESP_ENCRYPT, ESP_NODE)
-
-#define _(v, s) IPSEC_OUTPUT_NEXT_##v,
-typedef enum
-{
-  foreach_ipsec_output_next
-#undef _
-    IPSEC_OUTPUT_N_NEXT,
-} ipsec_output_next_t;
-
+#if WITH_LIBSSL > 0
 
 #define foreach_ipsec_output_error                   \
  _(RX_PKTS, "IPSec pkts received")                   \
@@ -50,7 +31,6 @@ typedef enum
  _(POLICY_BYPASS, "IPSec policy bypass")             \
  _(ENCAPS_FAILED, "IPSec encapsulation failed")
 
-
 typedef enum
 {
 #define _(sym,str) IPSEC_OUTPUT_ERROR_##sym,
@@ -108,19 +88,21 @@ ipsec_output_policy_match (ipsec_spd_t * spd, u8 pr, u32 la, u32 ra, u16 lp,
     if (PREDICT_FALSE (p->protocol && (p->protocol != pr)))
       continue;
 
-    if (la < clib_net_to_host_u32 (p->laddr.start.ip4.as_u32))
+    if (ra < clib_net_to_host_u32 (p->raddr.start.ip4.as_u32))
       continue;
 
-    if (la > clib_net_to_host_u32 (p->laddr.stop.ip4.as_u32))
+    if (ra > clib_net_to_host_u32 (p->raddr.stop.ip4.as_u32))
       continue;
 
-    if (ra < clib_net_to_host_u32 (p->raddr.start.ip4.as_u32))
+    if (la < clib_net_to_host_u32 (p->laddr.start.ip4.as_u32))
       continue;
 
-    if (ra > clib_net_to_host_u32 (p->raddr.stop.ip4.as_u32))
+    if (la > clib_net_to_host_u32 (p->laddr.stop.ip4.as_u32))
       continue;
 
-    if (PREDICT_FALSE ((pr != IP_PROTOCOL_TCP) && (pr != IP_PROTOCOL_UDP)))
+    if (PREDICT_FALSE
+       ((pr != IP_PROTOCOL_TCP) && (pr != IP_PROTOCOL_UDP)
+        && (pr != IP_PROTOCOL_SCTP)))
       return p;
 
     if (lp < p->lport.start)
@@ -173,7 +155,9 @@ ipsec_output_ip6_policy_match (ipsec_spd_t * spd,
     if (!ip6_addr_match_range (la, &p->laddr.start.ip6, &p->laddr.stop.ip6))
       continue;
 
-    if (PREDICT_FALSE ((pr != IP_PROTOCOL_TCP) && (pr != IP_PROTOCOL_UDP)))
+    if (PREDICT_FALSE
+       ((pr != IP_PROTOCOL_TCP) && (pr != IP_PROTOCOL_UDP)
+        && (pr != IP_PROTOCOL_SCTP)))
       return p;
 
     if (lp < p->lport.start)
@@ -290,8 +274,13 @@ ipsec_output_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
        {
          if (p0->policy == IPSEC_POLICY_ACTION_PROTECT)
            {
+             ipsec_sa_t *sa = 0;
              nc_protect++;
-             next_node_index = im->esp_encrypt_node_index;
+             sa = pool_elt_at_index (im->sad, p0->sa_index);
+             if (sa->protocol == IPSEC_PROTOCOL_ESP)
+               next_node_index = im->esp_encrypt_node_index;
+             else
+               next_node_index = im->ah_encrypt_node_index;
              vnet_buffer (b0)->ipsec.sad_index = p0->sa_index;
              vlib_buffer_advance (b0, iph_offset);
              p0->counter.packets++;