Removed option --with-plugin-tookit from automake. cicn-plugin is always compiled...

Change-Id: Ie607b242985a147f3884652b42485cf5660d4956
Signed-off-by: Alberto Compagno <[email protected]>

diff --git a/cicn-plugin/Makefile.am b/cicn-plugin/Makefile.am
index b6e659a..3cb1c02 100644 (file)
--- a/cicn-plugin/Makefile.am
+++ b/cicn-plugin/Makefile.am
@@ -74,7 +74,6 @@ cicn_api_test_plugin_la_CPPFLAGS = \
        -DCICN_VPP_CLIENTLIB=1
 cicn_api_test_plugin_la_LDFLAGS = -module
 
-if WITH_PLUGIN_TOOLKIT
 install-data-hook:
        mkdir -p /usr/lib/vpp_plugins
        mkdir -p /usr/lib/vpp_api_test_plugins
@@ -84,4 +83,3 @@ install-data-hook:
                /usr/lib/vpp_api_test_plugins/cicn_api_test_plugin.so
        rm -f $(prefix)/lib/cicn_plugin.*
        rm -f $(prefix)/lib/cicn_api_test_plugin.*
-endif

diff --git a/cicn-plugin/cicn/node.c b/cicn-plugin/cicn/node.c
index 8ef0453..0279df8 100644 (file)
--- a/cicn-plugin/cicn/node.c
+++ b/cicn-plugin/cicn/node.c
@@ -230,10 +230,6 @@ icnfwd_node_fn (vlib_main_t * vm,
 
       vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
 
-      /* TODO -- just doing 1-at-a-time for now, to simplify things a bit. */
-
-      /* TODO -- more interesting stats and trace */
-
       while (n_left_from > 0 && n_left_to_next > 0)
        {
          u32 bi0;
@@ -280,7 +276,6 @@ icnfwd_node_fn (vlib_main_t * vm,
 
          /* Dequeue a packet buffer */
          bi0 = from[0];
-         BUFTRC ("CICN-SW", bi0);
          from += 1;
          n_left_from -= 1;
 
@@ -1350,8 +1345,6 @@ icnfwd_node_fn (vlib_main_t * vm,
          /* Incr packet counter */
          pkts_processed += 1;
 
-         BUFTRC ((next0 == ICNFWD_NEXT_ERROR_DROP) ? "DROPTX1" : "ICN-TX1",
-                 bi0);
          /* Verify speculative enqueue, maybe switch current next frame */
          vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
                                           to_next, n_left_to_next,