[HICN-590] Removed andjacency type specific face implementation

Changes in the new implementation are:
 - the adjacency index is replaced with a dpo that allows the single face node
   to dispatch the packet to the right vlib node.
 - local and remote address in the face are replaced with a single nat address
   which is used to perform the nat operation when rewriting an interest or a
   data (in case of tunnels the nat address will be equal to 0)
 - the list of next hop in the load balance is no longer a list of dpos but
   a list of face id (this makes the code easier and increases the number of
   next hop we supports)

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

1 files changed, 9 insertions, 31 deletions

diff --git a/hicn-plugin/src/hicn.c b/hicn-plugin/src/hicn.c
index 7c2776869..e12d6d923 100644
--- a/hicn-plugin/src/hicn.c
+++ b/hicn-plugin/src/hicn.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:
@@ -25,7 +25,7 @@
 #include "error.h"
 #include "faces/app/address_mgr.h"
 #include "face_db.h"
-#include "faces/udp/face_udp.h"
+//#include "faces/udp/face_udp.h"
 #include "route.h"
 
 hicn_main_t hicn_main;
@@ -45,8 +45,7 @@ hicn_face_bucket_t *hicn_face_bucket_pool;
  * Init hicn forwarder with configurable PIT, CS sizes
  */
 static int
-hicn_infra_fwdr_init (uint32_t shard_pit_size, uint32_t shard_cs_size,
-		      uint32_t cs_reserved)
+hicn_infra_fwdr_init (uint32_t shard_pit_size, uint32_t shard_cs_size)
 {
   int ret = 0;
 
@@ -64,12 +63,7 @@ hicn_infra_fwdr_init (uint32_t shard_pit_size, uint32_t shard_cs_size,
   hicn_infra_slow_timer = 1;
 
   ret = hicn_pit_create (&hicn_main.pitcs, hicn_infra_pit_size);
-  hicn_pit_set_lru_max (&hicn_main.pitcs,
-			hicn_infra_cs_size -
-			(hicn_infra_cs_size * cs_reserved / 100));
-  hicn_pit_set_lru_app_max (&hicn_main.pitcs,
-			    hicn_infra_cs_size * cs_reserved / 100);
-
+  hicn_pit_set_lru_max (&hicn_main.pitcs, hicn_infra_cs_size);
 done:
   if ((ret == HICN_ERROR_NONE) && !hicn_infra_fwdr_initialized)
     {
@@ -86,12 +80,12 @@ int
 hicn_infra_plugin_enable_disable (int enable_disable,
 				  int pit_size_req,
 				  f64 pit_max_lifetime_sec_req,
-				  int cs_size_req, int cs_reserved_app)
+				  int cs_size_req)
 {
   int ret = 0;
 
   hicn_main_t *sm = &hicn_main;
-  uint32_t pit_size, cs_size, cs_reserved;
+  uint32_t pit_size, cs_size;
 
   /* Notice if we're already enabled... */
   if (sm->is_enabled)
@@ -168,18 +162,7 @@ hicn_infra_plugin_enable_disable (int enable_disable,
       cs_size = (uint32_t) cs_size_req;
     }
 
-  if (cs_reserved_app < 0)
-    {
-      cs_reserved = HICN_PARAM_CS_RESERVED_APP;
-    }
-  else
-    {
-      if (cs_reserved_app >= 100)
-	ret = HICN_ERROR_CS_CONFIG_RESERVED_OOB;
-      cs_reserved = cs_reserved_app;
-    }
-
-  ret = hicn_infra_fwdr_init (pit_size, cs_size, cs_reserved);
+  ret = hicn_infra_fwdr_init (pit_size, cs_size);
 
   hicn_face_db_init (pit_size);
 
@@ -189,7 +172,7 @@ hicn_infra_plugin_enable_disable (int enable_disable,
     }
   sm->is_enabled = 1;
 
-  hicn_face_udp_init_internal ();
+  //hicn_face_udp_init_internal ();
 
 done:
 
@@ -202,7 +185,6 @@ hicn_configure (vlib_main_t * vm, unformat_input_t * input)
   u32 pit_size = HICN_PARAM_PIT_ENTRIES_DFLT;
   u32 cs_size = HICN_PARAM_CS_ENTRIES_DFLT;
   u64 pit_lifetime_max_sec = HICN_PARAM_PIT_LIFETIME_DFLT_MAX_MS / SEC_MS;
-  int cs_reserved = HICN_PARAM_CS_RESERVED_APP;
 
   while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
     {
@@ -212,19 +194,15 @@ hicn_configure (vlib_main_t * vm, unformat_input_t * input)
 	;
       else if (unformat (input, "pit-lifetime-max %u", &pit_lifetime_max_sec))
 	;
-      else if (unformat (input, "cs-reserved-app %u", &cs_reserved))
-	;
       else
 	break;
-//  clib_error_return (0, 
-//                                                            "hICN parameter unknown");
     }
 
   unformat_free (input);
 
   hicn_infra_plugin_enable_disable (1, pit_size,
 				    pit_lifetime_max_sec,
-				    cs_size, cs_reserved);
+				    cs_size);
 
 
   return 0;