From e6a120973cca65ca464d1323a6f7f4308dcb4717 Mon Sep 17 00:00:00 2001 From: Alberto Compagno Date: Mon, 9 Mar 2020 11:39:59 +0100 Subject: [HICN-547] Removing punting through acl for interests Change-Id: I71767f732ec6ede1efc66e5a99f09c3207367dcb Signed-off-by: Alberto Compagno --- hicn-plugin/src/strategies/strategy_mw.c | 103 +++++++++---------------------- 1 file changed, 30 insertions(+), 73 deletions(-) (limited to 'hicn-plugin/src/strategies/strategy_mw.c') diff --git a/hicn-plugin/src/strategies/strategy_mw.c b/hicn-plugin/src/strategies/strategy_mw.c index 40e062bd8..2422d4fed 100644 --- a/hicn-plugin/src/strategies/strategy_mw.c +++ b/hicn-plugin/src/strategies/strategy_mw.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 Cisco and/or its affiliates. + * Copyright (c) 2017-2020 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: @@ -12,16 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -#include -#include - +#include "dpo_mw.h" #include "../strategy.h" #include "../strategy_dpo_ctx.h" -#include "dpo_mw.h" #include "../faces/face.h" -#include "../route.h" -#include "../pcs.h" +#include "../hashtb.h" #include "../strategy_dpo_manager.h" /* Simple strategy that chooses the next hop with the maximum weight */ @@ -32,20 +27,17 @@ void hicn_on_interest_timeout_mw (index_t dpo_idx); u32 hicn_select_next_hop_mw (index_t dpo_idx, int *nh_idx, dpo_id_t ** outface); u32 get_strategy_node_index_mw (void); +u8 *hicn_strategy_format_trace_mw (u8 * s, hicn_strategy_trace_t * t); +u8 *hicn_strategy_format_mw (u8 * s, va_list * ap); + static hicn_strategy_vft_t hicn_strategy_mw_vft = { .hicn_receive_data = &hicn_receive_data_mw, .hicn_add_interest = &hicn_add_interest_mw, .hicn_on_interest_timeout = &hicn_on_interest_timeout_mw, .hicn_select_next_hop = &hicn_select_next_hop_mw, - .get_strategy_node_index = get_strategy_node_index_mw -}; - -/* Stats string values */ -static char *hicn_strategy_error_strings[] = { -#define _(sym, string) string, - foreach_hicnfwd_error -#undef _ + .hicn_format_strategy_trace = hicn_strategy_format_trace_mw, + .hicn_format_strategy = &hicn_strategy_format_mw }; /* @@ -57,29 +49,22 @@ hicn_mw_strategy_get_vft (void) return &hicn_strategy_mw_vft; } -/* Registration struct for a graph node */ -vlib_node_registration_t hicn_mw_strategy_node; - -u32 -get_strategy_node_index_mw (void) -{ - return hicn_mw_strategy_node.index; -} - /* DPO should be give in input as it containes all the information to calculate the next hops*/ u32 hicn_select_next_hop_mw (index_t dpo_idx, int *nh_idx, dpo_id_t ** outface) { - hicn_strategy_mw_ctx_t *hicn_strategy_mw_ctx = - (hicn_strategy_mw_ctx_t *) hicn_strategy_mw_ctx_get (dpo_idx); + hicn_dpo_ctx_t *dpo_ctx = hicn_strategy_dpo_ctx_get (dpo_idx); - if(hicn_strategy_mw_ctx == NULL) + if (dpo_ctx == NULL) return HICN_ERROR_STRATEGY_NOT_FOUND; + hicn_strategy_mw_ctx_t *hicn_strategy_mw_ctx = + (hicn_strategy_mw_ctx_t *) dpo_ctx->data; + u8 next_hop_index = 0; - for (int i = 0; i < hicn_strategy_mw_ctx->default_ctx.entry_count; i++) + for (int i = 0; i < dpo_ctx->entry_count; i++) { - if (dpo_id_is_valid (&hicn_strategy_mw_ctx->default_ctx.next_hops[i])) + if (dpo_id_is_valid (&dpo_ctx->next_hops[i])) { if (hicn_strategy_mw_ctx->weight[next_hop_index] < hicn_strategy_mw_ctx->weight[i]) @@ -89,33 +74,21 @@ hicn_select_next_hop_mw (index_t dpo_idx, int *nh_idx, dpo_id_t ** outface) } } - if (!dpo_id_is_valid - (&hicn_strategy_mw_ctx->default_ctx.next_hops[next_hop_index])) + if (!dpo_id_is_valid (&dpo_ctx->next_hops[next_hop_index])) return HICN_ERROR_STRATEGY_NH_NOT_FOUND; - *outface = - (dpo_id_t *) & hicn_strategy_mw_ctx->default_ctx. - next_hops[next_hop_index]; + *outface = (dpo_id_t *) & dpo_ctx->next_hops[next_hop_index]; return HICN_ERROR_NONE; } -uword -hicn_mw_strategy_node_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) -{ - return hicn_forward_interest_fn (vm, node, frame, &hicn_strategy_mw_vft, - hicn_dpo_strategy_mw_get_type (), - &hicn_mw_strategy_node); -} - void hicn_add_interest_mw (index_t dpo_ctx_idx, hicn_hash_entry_t * hash_entry) { hash_entry->dpo_ctx_id = dpo_ctx_idx; dpo_id_t hicn_dpo_id = { hicn_dpo_strategy_mw_get_type (), 0, 0, dpo_ctx_idx }; - hicn_strategy_mw_ctx_lock (&hicn_dpo_id); + hicn_strategy_dpo_ctx_lock (&hicn_dpo_id); hash_entry->vft_id = hicn_dpo_get_vft_id (&hicn_dpo_id); } @@ -132,41 +105,25 @@ hicn_receive_data_mw (index_t dpo_idx, int nh_idx) /* packet trace format function */ -static u8 * -hicn_strategy_format_trace_mw (u8 * s, va_list * args) +u8 * +hicn_strategy_format_trace_mw (u8 * s, hicn_strategy_trace_t * t) { - 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_strategy_trace_t *t = va_arg (*args, hicn_strategy_trace_t *); - s = format (s, "Strategy_mw: pkt: %d, sw_if_index %d, next index %d", (int) t->pkt_type, t->sw_if_index, t->next_index); return (s); } -/* - * Node registration for the forwarder node - */ -/* *INDENT-OFF* */ -VLIB_REGISTER_NODE (hicn_mw_strategy_node) = +u8 * +hicn_strategy_format_mw (u8 * s, va_list * ap) { - .name = "hicn-mw-strategy", - .function = hicn_mw_strategy_node_fn, - .vector_size = sizeof (u32), - .runtime_data_bytes = sizeof (int) + sizeof(hicn_pit_cs_t *), - .format_trace = hicn_strategy_format_trace_mw, - .type = VLIB_NODE_TYPE_INTERNAL, - .n_errors = ARRAY_LEN (hicn_strategy_error_strings), - .error_strings = hicn_strategy_error_strings, - .n_next_nodes = HICN_STRATEGY_N_NEXT, - .next_nodes = { - [HICN_STRATEGY_NEXT_INTEREST_HITPIT] = "hicn-interest-hitpit", - [HICN_STRATEGY_NEXT_INTEREST_HITCS] = "hicn-interest-hitcs", - [HICN_STRATEGY_NEXT_ERROR_DROP] = "error-drop", - [HICN_STRATEGY_NEXT_EMPTY] = "ip4-lookup", - }, -}; -/* *INDENT-ON* */ + + u32 indent = va_arg (*ap, u32); + s = + format (s, + "Static Weights: weights are updated by the control plane, next hop is the one with the maximum weight.\n", + indent); + return (s); +} /* * fd.io coding-style-patch-verification: ON -- cgit 1.2.3-korg