udp: fix inner packet checksum calculation in udp-encap

[vpp.git] / src / vnet / udp / udp_encap.c

diff --git a/src/vnet/udp/udp_encap.c b/src/vnet/udp/udp_encap.c
index 072bc79..a0f5a50 100644 (file)
--- a/src/vnet/udp/udp_encap.c
+++ b/src/vnet/udp/udp_encap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Cisco and/or its affiliates.
+ * Copyright (c) 2017-2019 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -15,6 +15,7 @@
 
 #include <vnet/udp/udp_encap.h>
 #include <vnet/fib/fib_entry.h>
+#include <vnet/fib/fib_entry_track.h>
 #include <vnet/fib/fib_table.h>
 #include <vnet/dpo/drop_dpo.h>
 
@@ -46,8 +47,7 @@ static void
 udp_encap_restack (udp_encap_t * ue)
 {
   dpo_stack (udp_encap_dpo_types[ue->ue_ip_proto],
-            fib_proto_to_dpo (ue->ue_ip_proto),
-            &ue->ue_dpo,
+            fib_proto_to_dpo (ue->ue_ip_proto), &ue->ue_dpo,
             fib_entry_contribute_ip_forwarding (ue->ue_fib_entry_index));
 }
 
@@ -63,7 +63,7 @@ udp_encap_add_and_lock (fib_protocol_t proto,
   u8 pfx_len = 0;
   index_t uei;
 
-  pool_get_aligned (udp_encap_pool, ue, CLIB_CACHE_LINE_BYTES);
+  pool_get_aligned_zero (udp_encap_pool, ue, CLIB_CACHE_LINE_BYTES);
   uei = ue - udp_encap_pool;
 
   vlib_validate_combined_counter (&(udp_encap_counters), uei);
@@ -117,14 +117,10 @@ udp_encap_add_and_lock (fib_protocol_t proto,
     .fp_addr = *dst_ip,
   };
 
-  ue->ue_fib_entry_index =
-    fib_table_entry_special_add (fib_index,
-                                &dst_pfx,
-                                FIB_SOURCE_RR, FIB_ENTRY_FLAG_NONE);
-  ue->ue_fib_sibling =
-    fib_entry_child_add (ue->ue_fib_entry_index,
-                        FIB_NODE_TYPE_UDP_ENCAP, uei);
-
+  ue->ue_fib_entry_index = fib_entry_track (fib_index,
+                                           &dst_pfx,
+                                           FIB_NODE_TYPE_UDP_ENCAP,
+                                           uei, &ue->ue_fib_sibling);
   udp_encap_restack (ue);
 
   return (uei);
@@ -211,7 +207,7 @@ format_udp_encap_i (u8 * s, va_list * args)
   ue = udp_encap_get (uei);
 
   // FIXME
-  s = format (s, "udp-ecap:[%d]: ip-fib-index:%d ", uei, ue->ue_fib_index);
+  s = format (s, "udp-encap:[%d]: ip-fib-index:%d ", uei, ue->ue_fib_index);
   if (FIB_PROTOCOL_IP4 == ue->ue_ip_proto)
     {
       s = format (s, "ip:[src:%U, dst:%U] udp:[src:%d, dst:%d]",
@@ -322,20 +318,18 @@ udp_encap_fib_last_lock_gone (fib_node_t * node)
      */
   dpo_reset (&ue->ue_dpo);
 
-  fib_entry_child_remove (ue->ue_fib_entry_index, ue->ue_fib_sibling);
-  fib_table_entry_delete_index (ue->ue_fib_entry_index, FIB_SOURCE_RR);
-
+  fib_entry_untrack (ue->ue_fib_entry_index, ue->ue_fib_sibling);
 
   pool_put (udp_encap_pool, ue);
 }
 
 const static char *const udp4_encap_ip4_nodes[] = {
-  "udp4-encap",
+  "udp4o4-encap",
   NULL,
 };
 
 const static char *const udp4_encap_ip6_nodes[] = {
-  "udp4-encap",
+  "udp6o4-encap",
   NULL,
 };
 
@@ -350,12 +344,12 @@ const static char *const udp4_encap_bier_nodes[] = {
 };
 
 const static char *const udp6_encap_ip4_nodes[] = {
-  "udp6-encap",
+  "udp4o6-encap",
   NULL,
 };
 
 const static char *const udp6_encap_ip6_nodes[] = {
-  "udp6-encap",
+  "udp6o6-encap",
   NULL,
 };
 
@@ -513,11 +507,11 @@ udp_encap_walk (udp_encap_walk_cb_t cb, void *ctx)
   index_t uei;
 
   /* *INDENT-OFF* */
-  pool_foreach_index(uei, udp_encap_pool,
-  ({
+  pool_foreach_index (uei, udp_encap_pool)
+   {
     if (WALK_STOP == cb(uei, ctx))
       break;
-  }));
+  }
   /* *INDENT-ON* */
 }
 
@@ -542,10 +536,10 @@ udp_encap_show (vlib_main_t * vm,
   if (INDEX_INVALID == uei)
     {
       /* *INDENT-OFF* */
-      pool_foreach_index(uei, udp_encap_pool,
-      ({
+      pool_foreach_index (uei, udp_encap_pool)
+       {
         vlib_cli_output(vm, "%U", format_udp_encap, uei, 0);
-      }));
+      }
       /* *INDENT-ON* */
     }
   else