[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, 10 insertions, 27 deletions

diff --git a/hicn-plugin/src/mapme_ctrl.h b/hicn-plugin/src/mapme_ctrl.h
index e7c1cdf64..732a74b30 100644
--- a/hicn-plugin/src/mapme_ctrl.h
+++ b/hicn-plugin/src/mapme_ctrl.h
@@ -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:
@@ -51,34 +51,17 @@ typedef enum
  * @brief Returns the next hop node on which we can send an ACK packet
  */
 always_inline hicn_mapme_ctrl_next_t
-hicn_mapme_get_dpo_iface_node (dpo_id_t * dpo)
+hicn_mapme_get_dpo_iface_node (hicn_face_id_t face_id)
 {
-  if (dpo->dpoi_type == hicn_face_ip_type)
-    {
-      switch (dpo->dpoi_proto)
-	{
-	case DPO_PROTO_IP4:
-	  return HICN_MAPME_CTRL_NEXT_IP4_OUTPUT;
-	case DPO_PROTO_IP6:
-	  return HICN_MAPME_CTRL_NEXT_IP6_OUTPUT;
-	default:
-	  return HICN_MAPME_CTRL_NEXT_ERROR_DROP;
-	}
-    }
-  else if (dpo->dpoi_type == hicn_face_udp_type)
-    {
-      switch (dpo->dpoi_proto)
-	{
-	case DPO_PROTO_IP4:
-	  return HICN_MAPME_CTRL_NEXT_UDP46_OUTPUT;
-	case DPO_PROTO_IP6:
-	  return HICN_MAPME_CTRL_NEXT_UDP66_OUTPUT;
-	default:
-	  return HICN_MAPME_CTRL_NEXT_ERROR_DROP;
-	}
-    }
-  else
+  hicn_face_t * face  = hicn_dpoi_get_from_idx(face_id);
+
+  switch (dpo->dpoi_proto)
     {
+    case DPO_PROTO_IP4:
+      return HICN_MAPME_CTRL_NEXT_IP4_OUTPUT;
+    case DPO_PROTO_IP6:
+      return HICN_MAPME_CTRL_NEXT_IP6_OUTPUT;
+    default:
       return HICN_MAPME_CTRL_NEXT_ERROR_DROP;
     }
 }