[HICN-547] Removing punting through acl for interests

Change-Id: I71767f732ec6ede1efc66e5a99f09c3207367dcb
Signed-off-by: Alberto Compagno <acompagn+fdio@cisco.com>

1 files changed, 42 insertions, 166 deletions

diff --git a/hicn-plugin/src/strategies/dpo_rr.c b/hicn-plugin/src/strategies/dpo_rr.c
index dfdc83ff4..a67b06acb 100644
--- a/hicn-plugin/src/strategies/dpo_rr.c
+++ b/hicn-plugin/src/strategies/dpo_rr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019 Cisco and/or its affiliates.
+ * Copyright (c) 2017-2020 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:
@@ -13,27 +13,10 @@
  * limitations under the License.
  */
 
-#include "../strategy_dpo_ctx.h"
 #include "dpo_rr.h"
 #include "strategy_rr.h"
 #include "../strategy_dpo_manager.h"
-
-hicn_strategy_rr_ctx_t *hicn_strategy_rr_ctx_pool;
-
-const static char *const hicn_ip6_nodes[] = {
-  "hicn-rr-strategy",		// this is the name you give your node in VLIB_REGISTER_NODE
-  NULL,
-};
-
-const static char *const hicn_ip4_nodes[] = {
-  "hicn-rr-strategy",		// this is the name you give your node in VLIB_REGISTER_NODE
-  NULL,
-};
-
-const static char *const *const hicn_nodes_rr[DPO_PROTO_NUM] = {
-  [DPO_PROTO_IP6] = hicn_ip6_nodes,
-  [DPO_PROTO_IP4] = hicn_ip4_nodes,
-};
+#include "../strategy_dpo_ctx.h"
 
 /**
  * @brief DPO type value for the rr_strategy
@@ -41,16 +24,13 @@ const static char *const *const hicn_nodes_rr[DPO_PROTO_NUM] = {
 static dpo_type_t hicn_dpo_type_rr;
 
 static const hicn_dpo_vft_t hicn_dpo_rr_vft = {
-  .hicn_dpo_get_ctx = &hicn_strategy_rr_ctx_get,
   .hicn_dpo_is_type = &hicn_dpo_is_type_strategy_rr,
   .hicn_dpo_get_type = &hicn_dpo_strategy_rr_get_type,
   .hicn_dpo_module_init = &hicn_dpo_strategy_rr_module_init,
   .hicn_dpo_create = &hicn_strategy_rr_ctx_create,
   .hicn_dpo_add_update_nh = &hicn_strategy_rr_ctx_add_nh,
   .hicn_dpo_del_nh = &hicn_strategy_rr_ctx_del_nh,
-  .hicn_dpo_lock_dpo_ctx = &hicn_strategy_rr_ctx_lock,
-  .hicn_dpo_unlock_dpo_ctx = hicn_strategy_rr_ctx_unlock,
-  .format_hicn_dpo = &format_hicn_dpo_strategy_rr
+  .hicn_dpo_format = &hicn_strategy_rr_format_ctx
 };
 
 int
@@ -62,28 +42,15 @@ hicn_dpo_is_type_strategy_rr (const dpo_id_t * dpo)
 void
 hicn_dpo_strategy_rr_module_init (void)
 {
-  pool_validate_index (hicn_strategy_rr_ctx_pool, 0);
   /*
    * Register our type of dpo
    */
   hicn_dpo_type_rr =
-    hicn_dpo_register_new_type (hicn_nodes_rr, &hicn_dpo_rr_vft,
+    hicn_dpo_register_new_type (hicn_nodes_strategy, &hicn_dpo_rr_vft,
 				hicn_rr_strategy_get_vft (),
 				&dpo_strategy_rr_ctx_vft);
 }
 
-u8 *
-format_hicn_dpo_strategy_rr (u8 * s, va_list * ap)
-{
-
-  u32 indent = va_arg (*ap, u32);
-  s =
-    format (s,
-	    "Round Robin: next hop is chosen ciclying between all the available next hops, one after the other.\n",
-	    indent);
-  return (s);
-}
-
 dpo_type_t
 hicn_dpo_strategy_rr_get_type (void)
 {
@@ -92,32 +59,14 @@ hicn_dpo_strategy_rr_get_type (void)
 
 //////////////////////////////////////////////////////////////////////////////////////////////////
 
-void
-hicn_strategy_rr_ctx_lock (dpo_id_t * dpo)
-{
-  hicn_strategy_rr_ctx_t *hicn_strategy_rr_ctx =
-    (hicn_strategy_rr_ctx_t *) hicn_strategy_rr_ctx_get (dpo->dpoi_index);
-
-  if (hicn_strategy_rr_ctx != NULL)
-    {
-      hicn_strategy_rr_ctx->default_ctx.locks++;
-    }
-}
 
-void
-hicn_strategy_rr_ctx_unlock (dpo_id_t * dpo)
+u8 *
+hicn_strategy_rr_format_ctx (u8 * s, int n, ...)
 {
-  hicn_strategy_rr_ctx_t *hicn_strategy_rr_ctx =
-    (hicn_strategy_rr_ctx_t *) hicn_strategy_rr_ctx_get (dpo->dpoi_index);
-  if (hicn_strategy_rr_ctx != NULL)
-    {
-      hicn_strategy_rr_ctx->default_ctx.locks--;
-
-      if (0 == hicn_strategy_rr_ctx->default_ctx.locks)
-	{
-	  pool_put (hicn_strategy_rr_ctx_pool, hicn_strategy_rr_ctx);
-	}
-    }
+  va_list args;
+  va_start (args, n);
+  s = format_hicn_strategy_rr_ctx (s, &args);
+  return s;
 }
 
 u8 *
@@ -125,28 +74,34 @@ format_hicn_strategy_rr_ctx (u8 * s, va_list * ap)
 {
   int i = 0;
   index_t index = va_arg (*ap, index_t);
-  hicn_strategy_rr_ctx_t *dpo = NULL;
+  hicn_dpo_ctx_t *dpo_ctx = NULL;
+  hicn_strategy_rr_ctx_t *rr_dpo_ctx = NULL;
   dpo_id_t *next_hop = NULL;
   hicn_face_vft_t *face_vft = NULL;
-  u32 indent = va_arg (*ap, u32);;
+  u32 indent = va_arg (*ap, u32);
 
-  dpo = (hicn_strategy_rr_ctx_t *) hicn_strategy_rr_ctx_get (index);
+  dpo_ctx = hicn_strategy_dpo_ctx_get (index);
+  if (dpo_ctx == NULL)
+    return s;
+
+  rr_dpo_ctx = (hicn_strategy_rr_ctx_t *) dpo_ctx->data;
 
   s =
     format (s, "hicn-rr, next hop Face %d",
-	    dpo->default_ctx.next_hops[dpo->current_nhop].dpoi_index);
+	    dpo_ctx->next_hops[rr_dpo_ctx->current_nhop].dpoi_index);
 
-  for (i = 0; i < HICN_PARAM_FIB_ENTRY_NHOPS_MAX && dpo != NULL; i++)
+  for (i = 0; i < HICN_PARAM_FIB_ENTRY_NHOPS_MAX; i++)
     {
       u8 *buf = NULL;
-      if (i < dpo->default_ctx.entry_count)
-	buf = format(NULL, "FIB");
-      else if (i >= HICN_PARAM_FIB_ENTRY_NHOPS_MAX - dpo->default_ctx.tfib_entry_count)
-	buf = format(NULL, "TFIB");
+      if (i < dpo_ctx->entry_count)
+	buf = format (NULL, "FIB");
+      else if (i >=
+	       HICN_PARAM_FIB_ENTRY_NHOPS_MAX - dpo_ctx->tfib_entry_count)
+	buf = format (NULL, "TFIB");
       else
 	continue;
 
-      next_hop = &dpo->default_ctx.next_hops[i];
+      next_hop = &dpo_ctx->next_hops[i];
       face_vft = hicn_face_get_vft (next_hop->dpoi_type);
       if (face_vft != NULL)
 	{
@@ -154,132 +109,53 @@ format_hicn_strategy_rr_ctx (u8 * s, va_list * ap)
 	  s =
 	    format (s, "%U ", face_vft->format_face, next_hop->dpoi_index,
 		    indent);
-          s = format (s, " %s", buf);
+	  s = format (s, " %s", buf);
 	}
     }
 
   return (s);
 }
 
-static index_t
-hicn_strategy_rr_ctx_get_index (hicn_strategy_rr_ctx_t * cd)
-{
-  return (cd - hicn_strategy_rr_ctx_pool);
-}
-
-int
+void
 hicn_strategy_rr_ctx_create (dpo_proto_t proto, const dpo_id_t * next_hop,
 			     int nh_len, index_t * dpo_idx)
 {
   hicn_strategy_rr_ctx_t *hicn_strategy_rr_ctx;
-  int ret = HICN_ERROR_NONE, i;
+  hicn_dpo_ctx_t *hicn_strategy_ctx;
 
   /* Allocate a hicn_dpo_ctx on the vpp pool and initialize it */
-  pool_get (hicn_strategy_rr_ctx_pool, hicn_strategy_rr_ctx);
+  hicn_strategy_ctx = hicn_strategy_dpo_ctx_alloc ();
+  hicn_strategy_rr_ctx = (hicn_strategy_rr_ctx_t *) hicn_strategy_ctx->data;
 
-  *dpo_idx = hicn_strategy_rr_ctx_get_index (hicn_strategy_rr_ctx);
+  *dpo_idx = hicn_strategy_dpo_ctx_get_index (hicn_strategy_ctx);
 
-  init_dpo_ctx (&(hicn_strategy_rr_ctx->default_ctx));
-
-  for (i = 0; i < HICN_PARAM_FIB_ENTRY_NHOPS_MAX && i < nh_len; i++)
-    {
-      clib_memcpy (&hicn_strategy_rr_ctx->default_ctx.next_hops[i],
-		   &next_hop[i], sizeof (dpo_id_t));
-      hicn_strategy_rr_ctx->default_ctx.entry_count++;
-    }
+  init_dpo_ctx (hicn_strategy_ctx, next_hop, nh_len, hicn_dpo_type_rr);
 
   hicn_strategy_rr_ctx->current_nhop = 0;
-
-  return ret;
-}
-
-hicn_dpo_ctx_t *
-hicn_strategy_rr_ctx_get (index_t index)
-{
-  hicn_strategy_rr_ctx_t *hicn_strategy_rr_ctx = NULL;
-  if (!pool_is_free_index (hicn_strategy_rr_ctx_pool, index))
-    {
-      hicn_strategy_rr_ctx =
-	(pool_elt_at_index (hicn_strategy_rr_ctx_pool, index));
-    }
-  return (hicn_dpo_ctx_t *)hicn_strategy_rr_ctx;
 }
 
 int
 hicn_strategy_rr_ctx_add_nh (const dpo_id_t * nh, index_t dpo_idx)
 {
-  hicn_strategy_rr_ctx_t *hicn_strategy_rr_ctx =
-    (hicn_strategy_rr_ctx_t *) hicn_strategy_rr_ctx_get (dpo_idx);
+  hicn_dpo_ctx_t *hicn_strategy_dpo_ctx = hicn_strategy_dpo_ctx_get (dpo_idx);
+  u8 pos = 0;
 
-  if (hicn_strategy_rr_ctx == NULL)
+  if (hicn_strategy_dpo_ctx == NULL)
     {
       return HICN_ERROR_STRATEGY_NOT_FOUND;
     }
 
-  int empty = hicn_strategy_rr_ctx->default_ctx.entry_count;
-
-  /* Iterate through the list of faces to add new faces */
-  for (int i = 0; i < hicn_strategy_rr_ctx->default_ctx.entry_count; i++)
-    {
-      if (!memcmp
-          (nh, &hicn_strategy_rr_ctx->default_ctx.next_hops[i],
-           sizeof (dpo_id_t)))
-        {
-          /* If face is marked as deleted, ignore it */
-          hicn_face_t *face =
-            hicn_dpoi_get_from_idx (hicn_strategy_rr_ctx->default_ctx.
-                                    next_hops[i].dpoi_index);
-          if (face->shared.flags & HICN_FACE_FLAGS_DELETED)
-            {
-              continue;
-            }
-          return HICN_ERROR_DPO_CTX_NHOPS_EXISTS;
-        }
-    }
-
-  /* Get an empty place */
-  if (empty > HICN_PARAM_FIB_ENTRY_NHOPS_MAX)
-    {
-      return HICN_ERROR_DPO_CTX_NHOPS_NS;
-    }
-
-  clib_memcpy (&hicn_strategy_rr_ctx->default_ctx.next_hops[empty], nh,
-               sizeof (dpo_id_t));
-  hicn_strategy_rr_ctx->default_ctx.entry_count++;
-
+  hicn_strategy_dpo_ctx_add_nh (nh, hicn_strategy_dpo_ctx, &pos);
+  //nothing else to initialize in this strategy
   return HICN_ERROR_NONE;
 }
 
 int
-hicn_strategy_rr_ctx_del_nh (hicn_face_id_t face_id, index_t dpo_idx,
-			     fib_prefix_t * fib_pfx)
+hicn_strategy_rr_ctx_del_nh (hicn_face_id_t face_id, index_t dpo_idx)
 {
-  hicn_strategy_rr_ctx_t *hicn_strategy_rr_ctx =
-    (hicn_strategy_rr_ctx_t *) hicn_strategy_rr_ctx_get (dpo_idx);
-  int ret = HICN_ERROR_DPO_CTX_NOT_FOUND;
-  dpo_id_t invalid = NEXT_HOP_INVALID;
-
-  if (hicn_strategy_rr_ctx == NULL)
-    {
-      return HICN_ERROR_STRATEGY_NOT_FOUND;
-    }
-
-  for (int i = 0; i < hicn_strategy_rr_ctx->default_ctx.entry_count; i++)
-    {
-      if (hicn_strategy_rr_ctx->default_ctx.next_hops[i].dpoi_index ==
-          face_id)
-        {
-          hicn_face_unlock (&hicn_strategy_rr_ctx->
-                            default_ctx.next_hops[i]);
-          hicn_strategy_rr_ctx->default_ctx.entry_count--;
-          hicn_strategy_rr_ctx->default_ctx.next_hops[i] = hicn_strategy_rr_ctx->default_ctx.next_hops[hicn_strategy_rr_ctx->default_ctx.entry_count];
-          hicn_strategy_rr_ctx->default_ctx.next_hops[hicn_strategy_rr_ctx->default_ctx.entry_count] = invalid;
-          ret = HICN_ERROR_NONE;
-          break;
-        }
-    }
-
-  return ret;
+  hicn_dpo_ctx_t *hicn_strategy_dpo_ctx = hicn_strategy_dpo_ctx_get (dpo_idx);
+  //No need to change the current_nhop. It will be updated at the next selection.
+  return hicn_strategy_dpo_ctx_del_nh (face_id, hicn_strategy_dpo_ctx);
 }
 
 /*