[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, 14 insertions, 26 deletions

diff --git a/hicn-plugin/src/CMakeLists.txt b/hicn-plugin/src/CMakeLists.txt
index 71980765d..2d8a2c385 100644
--- a/hicn-plugin/src/CMakeLists.txt
+++ b/hicn-plugin/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# 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:
@@ -79,16 +79,9 @@ set(HICN_PLUGIN_SOURCE_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/error.c
     ${CMAKE_CURRENT_SOURCE_DIR}/faces/face_cli.c
     ${CMAKE_CURRENT_SOURCE_DIR}/faces/face.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/faces/ip/face_ip.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/faces/ip/face_ip_cli.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/faces/ip/face_ip_node.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/faces/ip/iface_ip_node.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/faces/ip/dpo_ip.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/faces/udp/face_udp.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/faces/udp/face_udp_cli.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/faces/udp/face_udp_node.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/faces/udp/iface_udp_node.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/faces/udp/dpo_udp.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/faces/face_node.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/faces/iface_node.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/faces/dpo_face.h
     ${CMAKE_CURRENT_SOURCE_DIR}/faces/app/address_mgr.c
     ${CMAKE_CURRENT_SOURCE_DIR}/faces/app/face_cons.c
     ${CMAKE_CURRENT_SOURCE_DIR}/faces/app/face_prod.c
@@ -101,9 +94,9 @@ set(HICN_PLUGIN_SOURCE_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/strategies/dpo_rr.c
     ${CMAKE_CURRENT_SOURCE_DIR}/strategies/strategy_rr.c
     ${CMAKE_CURRENT_SOURCE_DIR}/cache_policies/cs_lru.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/mapme_ack_node.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/mapme_ctrl_node.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/mapme_eventmgr.c
+#    ${CMAKE_CURRENT_SOURCE_DIR}/mapme_ack_node.c
+#    ${CMAKE_CURRENT_SOURCE_DIR}/mapme_ctrl_node.c
+#    ${CMAKE_CURRENT_SOURCE_DIR}/mapme_eventmgr.c
 )
 
 set(HICN_PLUGIN_HEADER_FILES
@@ -130,14 +123,9 @@ set(HICN_PLUGIN_HEADER_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/error.h
     ${CMAKE_CURRENT_SOURCE_DIR}/face_db.h
     ${CMAKE_CURRENT_SOURCE_DIR}/faces/face.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/faces/ip/face_ip.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/faces/ip/face_ip_node.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/faces/ip/iface_ip_node.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/faces/ip/dpo_ip.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/faces/udp/face_udp.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/faces/udp/face_udp_node.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/faces/udp/iface_udp_node.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/faces/udp/dpo_udp.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/faces/face_node.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/faces/iface_node.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/faces/face_dpo.h
     ${CMAKE_CURRENT_SOURCE_DIR}/faces/app/address_mgr.h
     ${CMAKE_CURRENT_SOURCE_DIR}/faces/app/face_cons.h
     ${CMAKE_CURRENT_SOURCE_DIR}/faces/app/face_prod.h
@@ -148,10 +136,10 @@ set(HICN_PLUGIN_HEADER_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/strategies/strategy_rr.h
     ${CMAKE_CURRENT_SOURCE_DIR}/cache_policies/cs_policy.h
     ${CMAKE_CURRENT_SOURCE_DIR}/cache_policies/cs_lru.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mapme.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mapme_ack.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mapme_ctrl.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mapme_eventmgr.h
+ #   ${CMAKE_CURRENT_SOURCE_DIR}/mapme.h
+ #   ${CMAKE_CURRENT_SOURCE_DIR}/mapme_ack.h
+ #   ${CMAKE_CURRENT_SOURCE_DIR}/mapme_ctrl.h
+ #   ${CMAKE_CURRENT_SOURCE_DIR}/mapme_eventmgr.h
 )
 
 set(HICN_API_TEST_SOURCE_FILES