diff options
Diffstat (limited to 'hicn-plugin/src/mapme_ack_node.c')
| -rw-r--r-- | hicn-plugin/src/mapme_ack_node.c | 100 |
1 files changed, 50 insertions, 50 deletions
diff --git a/hicn-plugin/src/mapme_ack_node.c b/hicn-plugin/src/mapme_ack_node.c index f26895d20..e1f4d3889 100644 --- a/hicn-plugin/src/mapme_ack_node.c +++ b/hicn-plugin/src/mapme_ack_node.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2020 Cisco and/or its affiliates. + * Copyright (c) 2021 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: @@ -14,6 +14,7 @@ */ #include <vnet/ip/ip6_packet.h> +#include <vlib/log.h> #include "hicn.h" #include "mapme.h" @@ -30,8 +31,7 @@ extern hicn_mapme_main_t mapme_main; /* packet trace format function */ -static u8 *hicn_mapme_ack_format_trace (u8 * s, va_list * args); - +static u8 *hicn_mapme_ack_format_trace (u8 *s, va_list *args); /* Stats string values */ static char *hicn_mapme_ack_error_strings[] = { @@ -47,44 +47,42 @@ static char *hicn_mapme_ack_error_strings[] = { * @param face_id Ingress face id */ bool -hicn_mapme_process_ack (vlib_main_t * vm, vlib_buffer_t * b, - hicn_face_id_t in_face) +hicn_mapme_process_ack (vlib_main_t *vm, vlib_buffer_t *b, + hicn_face_id_t in_face, hicn_prefix_t *prefix, + u32 *seq) { seq_t fib_seq; const dpo_id_t *dpo; - hicn_prefix_t prefix; mapme_params_t params; int rc; /* Parse incoming message */ - rc = - hicn_mapme_parse_packet (vlib_buffer_get_current (b), &prefix, ¶ms); + rc = hicn_mapme_parse_packet (vlib_buffer_get_current (b), prefix, ¶ms); if (rc < 0) goto ERR_PARSE; - /* if (params.seq == INVALID_SEQ) */ - /* { */ - /* DEBUG ("Invalid sequence number found in IU"); */ - /* return true; */ - /* } */ + *seq = params.seq; + + HICN_DEBUG ("ACK - type:%d seq:%d prefix:%U len:%d", params.type, params.seq, + format_ip46_address, &prefix->name, IP46_TYPE_ANY, prefix->len); - dpo = fib_epm_lookup (&(prefix.name), prefix.len); + dpo = fib_lookup (&(prefix->name.as_ip46), prefix->len, + HICN_MAPME_FIB_LOOKUP_TYPE_EPM); if (!dpo) { - DEBUG ("Ignored ACK for non-existing FIB entry. Ignored."); + HICN_ERROR ("Ignored ACK for non-existing FIB entry %U. Ignored.", + format_ip_prefix, prefix); return true; - } /* We are only expecting ACKs for hICN DPOs */ ASSERT (dpo_is_hicn (dpo)); - hicn_mapme_tfib_t *tfib = - TFIB (hicn_strategy_dpo_ctx_get (dpo->dpoi_index)); + hicn_mapme_tfib_t *tfib = TFIB (hicn_strategy_dpo_ctx_get (dpo->dpoi_index)); if (tfib == NULL) { - WARN ("Unable to get strategy ctx."); + HICN_ERROR ("Unable to get strategy ctx."); return false; } @@ -96,27 +94,27 @@ hicn_mapme_process_ack (vlib_main_t * vm, vlib_buffer_t * b, */ if (params.seq < fib_seq) { - DEBUG ("Ignored ACK for low seq"); + HICN_ERROR ("MAPME: Ignored ACK for low seq"); return true; } - hicn_mapme_tfib_del (tfib, in_face); + rc = hicn_mapme_tfib_del (tfib, in_face) != HICN_ERROR_NONE; + if (rc != HICN_ERROR_NONE) + { + HICN_ERROR ( + "MAPME: Error deleting next hop %d from TFIB for prefix %U/%d", + in_face, format_ip46_address, &prefix->name, IP46_TYPE_ANY, + prefix->len); + } /* * Is the ingress face in TFIB ? if so, remove it, otherwise it might be a * duplicate */ - retx_t *retx = vlib_process_signal_event_data (vm, - hicn_mapme_eventmgr_process_node. - index, - HICN_MAPME_EVENT_FACE_PH_DEL, - 1, - sizeof (retx_t)); - *retx = (retx_t) - { - .prefix = prefix, - .dpo = *dpo - }; + retx_t *retx = vlib_process_signal_event_data ( + vm, hicn_mapme_eventmgr_process_node.index, HICN_MAPME_EVENT_FACE_PH_DEL, + 1, sizeof (retx_t)); + *retx = (retx_t){ .prefix = *prefix, .dpo = *dpo }; return true; @@ -127,24 +125,25 @@ ERR_PARSE: vlib_node_registration_t hicn_mapme_ack_node; static uword -hicn_mapme_ack_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * frame) +hicn_mapme_ack_node_fn (vlib_main_t *vm, vlib_node_runtime_t *node, + vlib_frame_t *frame) { hicn_buffer_t *hb; hicn_mapme_ack_next_t next_index; u32 n_left_from, *from, *to_next; n_left_from = frame->n_vectors; + hicn_prefix_t prefix; + u32 seq; from = vlib_frame_vector_args (frame); n_left_from = frame->n_vectors; next_index = node->cached_next_index; - while (n_left_from > 0) // buffers in the current frame + while (n_left_from > 0) // buffers in the current frame { u32 n_left_to_next; vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next); - while (n_left_from > 0 && n_left_to_next > 0) { u32 bi0; @@ -162,51 +161,53 @@ hicn_mapme_ack_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_cli_output (vm, "Received IUAck"); hb = hicn_get_buffer (b0); - hicn_mapme_process_ack (vm, b0, hb->face_id); + hicn_mapme_process_ack (vm, b0, hb->face_id, &prefix, &seq); /* Single loop: process 1 packet here */ sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX]; - if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE) - && (b0->flags & VLIB_BUFFER_IS_TRACED))) + if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE) && + (b0->flags & VLIB_BUFFER_IS_TRACED))) { hicn_mapme_ack_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t)); t->sw_if_index = sw_if_index0; t->next_index = next0; + t->prefix = prefix; + t->seq = seq; } /* $$$$$ Done processing 1 packet here $$$$$ */ /* verify speculative enqueue, maybe switch current next frame */ - vlib_validate_buffer_enqueue_x1 (vm, node, next_index, - to_next, n_left_to_next, - bi0, next0); + vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next, + n_left_to_next, bi0, next0); } vlib_put_next_frame (vm, node, next_index, n_left_to_next); } -// vlib_node_increment_counter (vm, hicn_mapme_ack_node.index, -// HICN_MAPME_ACK_ERROR_SWAPPED, pkts_swapped); + // vlib_node_increment_counter (vm, hicn_mapme_ack_node.index, + // HICN_MAPME_ACK_ERROR_SWAPPED, pkts_swapped); return (frame->n_vectors); } /* packet trace format function */ static u8 * -hicn_mapme_ack_format_trace (u8 * s, va_list * args) +hicn_mapme_ack_format_trace (u8 *s, va_list *args) { CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); hicn_mapme_ack_trace_t *t = va_arg (*args, hicn_mapme_ack_trace_t *); - s = format (s, "MAPME_ACK: pkt: %d, sw_if_index %d, next index %d", - (int) t->pkt_type, t->sw_if_index, t->next_index); + s = format ( + s, + "MAPME_ACK: pkt: %d, sw_if_index %d, next index %d, prefix %U/%d, seq %u", + (int) t->pkt_type, t->sw_if_index, t->next_index, format_ip46_address, + &t->prefix.name, IP46_TYPE_ANY, t->prefix.len, t->seq); return (s); } - /* * Node registration for the MAP-Me node processing special interests */ -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (hicn_mapme_ack_node) = { .function = hicn_mapme_ack_node_fn, @@ -223,7 +224,6 @@ VLIB_REGISTER_NODE (hicn_mapme_ack_node) = [HICN_MAPME_ACK_NEXT_ERROR_DROP] = "error-drop", }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON |