summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlberto Compagno <acompagn+fdio@cisco.com>2017-09-15 13:00:45 +0000
committerGerrit Code Review <gerrit@fd.io>2017-09-15 13:00:45 +0000
commit5b9b85339d0621c52ebddff808480ca251c7d8a1 (patch)
treee0055fb27fac47ca77f407b3ab7a0640766fbab3
parent691b4bb5305f42d06f2ad57633db3c170f7a9204 (diff)
parent21789cc0fe37843e8102da39799d352ae45f5432 (diff)
Merge "Removed option --with-plugin-tookit from automake. cicn-plugin is always compiled with the vpp plugin toolkit enabled" into cicn-plugin/master
-rw-r--r--cicn-plugin/Makefile.am2
-rw-r--r--cicn-plugin/cicn/node.c7
2 files changed, 0 insertions, 9 deletions
diff --git a/cicn-plugin/Makefile.am b/cicn-plugin/Makefile.am
index b6e659a3..3cb1c02b 100644
--- 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 8ef0453b..0279df84 100644
--- 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,