diff options
| author |   Michele Papalini <micpapal@cisco.com> | 2019-02-04 17:02:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2019-02-04 17:02:40 +0000 |
| commit | 7b7a5cfb320f3cb4ac541a6e95ae949c4e4fa3fc (patch) | |
| tree | 4ca23e605d3a66fa069f712b02a7386e288d2ab8 | |
| parent | c02c87fca9a3bc59eab6950389e89618f4ec4245 (diff) | |
| parent | 83ef24a70ddbeb9daa9c12a68464cc3b8349bd4f (diff) | |
Merge "[HICN-30] Removed wrong string that was appearing on the producer face"
| -rw-r--r-- | hicn-plugin/src/faces/app/face_prod_node.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/hicn-plugin/src/faces/app/face_prod_node.c b/hicn-plugin/src/faces/app/face_prod_node.c index 2e746a703..a9fbfa7bf 100644 --- a/hicn-plugin/src/faces/app/face_prod_node.c +++ b/hicn-plugin/src/faces/app/face_prod_node.c @@ -27,20 +27,9 @@ #include "../../hicn_api.h" #include "../../mgmt.h" -#define foreach_face_prod_input_error \ - _(NOT_SOCK_PREFIX, "name not in the socket prefix") - -typedef enum -{ -#define _(f,s) FACE_PROD_INPUT_ERROR_##f, - foreach_face_prod_input_error -#undef _ - FACE_PROD_INPUT_N_ERROR, -} face_prod_input_error_t; - static __clib_unused char *face_prod_input_error_strings[] = { -#define _(n,s) s, - foreach_face_prod_input_error +#define _(sym, string) string, + foreach_hicnfwd_error #undef _ }; @@ -134,8 +123,6 @@ hicn_face_prod_next_from_data_hdr (vlib_node_runtime_t * node, match_res = match_ip6_name ((u32x4 *) & (ptr[8]), prefix); } - b->error = 0*(1-match_res) + match_res*(node->errors[FACE_PROD_INPUT_ERROR_NOT_SOCK_PREFIX]); - return match_res ? HICN_FACE_PROD_NEXT_DATA_IP4 + (v == 0x60) : HICN_FACE_PROD_NEXT_ERROR_DROP; @@ -304,9 +291,6 @@ hicn_face_prod_input_node_fn (vlib_main_t * vm, vlib_node_increment_counter (vm, node->node_index, HICNFWD_ERROR_PROCESSED, stats.pkts_processed); - vlib_node_increment_counter (vm, node->node_index, - HICNFWD_ERROR_INTERESTS, - stats.pkts_interest_count); vlib_node_increment_counter (vm, node->node_index, HICNFWD_ERROR_DATAS, stats.pkts_data_count); |