Update cicn-plugin for vpp v17.04 (from v17.01)Vpp-plugin-v17.04

1. Changes for cicn-plugin to build under v17.04:
   - update build files to v17.04, including
     - no longer need/want plugin to include dpdk headers (though
       still link in dpdk plugin)
     - vpp include changes
       - relocation of vpe.api.h
       - relocation of pneum.h
   - for modprobe, replace igb_uio with uio_pci_generic
   - vnet/ip/udp.h => vnet/udp/udp.h
   - update cicn vpp plugin registration per vpp changes
     - use new VLIB_PLUGIN_REGISTER() macro
     - delete no-loger-supported vlib_plugin_register() function,
       moving contents of latter to cicn_init
     - remove sm->ethernet_main, which was not used and is no longer part of
       plugin boilerplate.
   - cicn_api_test_plugin.so (plugin for vpp_api_test)
     - update per 17.04 updated requirements:
	 vat_api_hookup => cicn_vat_api_hookup
   - buffering/cloning changes needed for building
     - CICN_FEATURE_VPP_VLIB_CLONING hard-coded enabled and removed,
     - CICN_FEATURE_DPDK_RTEMBUF_CLONING removed
   - Small indentation updates from vpp checkstyle.sh
2. Updates for new vlib_buffer_attach_clone() API now exported by vpp
   - remove code to manage rte_mbuf: cicn plugin now longer depends
     on dpdk being present.
   - remove use of indirect header for cloned cs entry: new scheme
     supports having hdr buffer point directly to shared buffer rather
     that requiring hdr buffer to poitn to indirect header that
     points to cs buffer
   - cicn_rte_mbuf_inlines.h replaced by much smaller cicn_infra_inlines.h
   - report new characteristic of whether cloning replication is enabled
   - "cicn show internal" (dbg cli),  "cicn_api_node_params_get"
     (vpp_api_test)
      - update output accordingly
      - cicn_show: other tweaks to output
3. In node.c, in code for dropping possibly multiple buffers
   - delete ifdef'd-out code block for dropping using the drop node
     [this codepath possibly had buffer problems.]
   - retain code that instead drops by freeing buffers directly.
     [this codepath has been robust with respect to buffer management]

Change-Id: I6e3d18153f52d8b94773332a39cc452873589baf
Signed-off-by: Jim Gibson <gibson+fdio@cisco.com>

1 files changed, 6 insertions, 8 deletions

diff --git a/cicn-plugin/cicn/cicn_mgmt.c b/cicn-plugin/cicn/cicn_mgmt.c
index 18f03530..76fd7baa 100644
--- a/cicn-plugin/cicn/cicn_mgmt.c
+++ b/cicn-plugin/cicn/cicn_mgmt.c
@@ -28,7 +28,7 @@
 #include <vlibmemory/api.h>
 #include <vlibsocket/api.h>
 
-#include <vnet/ip/udp.h>	// port registration
+#include <vnet/udp/udp.h>	// port registration
 
 #include <cicn/cicn.h>
 
@@ -206,8 +206,7 @@ vl_api_cicn_api_node_params_get_t_handler (vl_api_cicn_api_node_params_get_t *
 
   rmp->feature_multithread = CICN_FEATURE_MULTITHREAD;
   rmp->feature_cs = CICN_FEATURE_CS;
-  rmp->feature_dpdk_rtembuf_cloning = CICN_FEATURE_DPDK_RTEMBUF_CLONING;
-  rmp->feature_vpp_vlib_cloning = CICN_FEATURE_VPP_VLIB_CLONING;
+  rmp->feature_clone_replication = CICN_INFRA_CLONE_REPLICATION;
 
   rmp->worker_count = clib_host_to_net_u32 (sm->worker_count);
 
@@ -1722,7 +1721,7 @@ cicn_cli_show_command_fn (vlib_main_t * vm, unformat_input_t * main_input,
       vlib_cli_output (vm,	//compare vl_api_cicn_api_node_stats_get_reply_t_handler block
 		       "  PIT entries (now): %d\n"
 		       "  CS entries (now): %d\n"
-		       "  Forwarding statistics:"
+		       "  Forwarding statistics:\n"
 		       "    pkts_processed: %d\n"
 		       "    pkts_interest_count: %d\n"
 		       "    pkts_data_count: %d\n"
@@ -1786,12 +1785,11 @@ done:
   if (all_p && internal_p)
     {
       vlib_cli_output (vm,
-		       "  Features: multithreading:%d, cs:%d, dpdk-cloning:%d, "
-		       "vlib-cloning:%d\n",
+		       "Plugin features: multithreading:%d, cs:%d, "
+		       "clone_replication:%d\n",
 		       CICN_FEATURE_MULTITHREAD,
 		       CICN_FEATURE_CS,
-		       CICN_FEATURE_DPDK_RTEMBUF_CLONING,
-		       CICN_FEATURE_VPP_VLIB_CLONING);
+		       CICN_INFRA_CLONE_REPLICATION);
     }
   return (0);
 }