From b3b64c5a0529bbbbdcaf14f72fb47667bb457e9d Mon Sep 17 00:00:00 2001 From: Mauro Sardara Date: Wed, 10 Feb 2021 16:34:47 +0100 Subject: [HICN-682] Fix hicn-plugin to be compatible with version 21.01 Signed-off-by: Mauro Sardara Change-Id: Ia116ad74ce78e2ca2d7ee624eea75a38936d27f8 Signed-off-by: Mauro Sardara --- hicn-plugin/src/strategies/strategy_rr.c | 40 ++++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'hicn-plugin/src/strategies/strategy_rr.c') diff --git a/hicn-plugin/src/strategies/strategy_rr.c b/hicn-plugin/src/strategies/strategy_rr.c index 4c65ce52a..9995191b7 100644 --- a/hicn-plugin/src/strategies/strategy_rr.c +++ b/hicn-plugin/src/strategies/strategy_rr.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2020 Cisco and/or its affiliates. + * Copyright (c) 2017-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: @@ -23,13 +23,12 @@ /* Simple strategy that chooses the next hop with the maximum weight */ /* It does not require to exend the hicn_dpo */ void hicn_receive_data_rr (index_t dpo_idx, int nh_idx); -void hicn_add_interest_rr (index_t dpo_idx, hicn_hash_entry_t * pit_entry); +void hicn_add_interest_rr (index_t dpo_idx, hicn_hash_entry_t *pit_entry); void hicn_on_interest_timeout_rr (index_t dpo_idx); u32 hicn_select_next_hop_rr (index_t dpo_idx, int *nh_idx, - hicn_face_id_t* outface); -u8 *hicn_strategy_format_trace_rr (u8 * s, hicn_strategy_trace_t * t); -u8 *hicn_strategy_format_rr (u8 * s, va_list * ap); - + hicn_face_id_t *outface); +u8 *hicn_strategy_format_trace_rr (u8 *s, hicn_strategy_trace_t *t); +u8 *hicn_strategy_format_rr (u8 *s, va_list *ap); static hicn_strategy_vft_t hicn_strategy_rr_vft = { .hicn_receive_data = &hicn_receive_data_rr, @@ -49,9 +48,10 @@ hicn_rr_strategy_get_vft (void) return &hicn_strategy_rr_vft; } -/* DPO should be give in input as it containes all the information to calculate the next hops*/ +/* DPO should be give in input as it containes all the information to calculate + * the next hops*/ u32 -hicn_select_next_hop_rr (index_t dpo_idx, int *nh_idx, hicn_face_id_t* outface) +hicn_select_next_hop_rr (index_t dpo_idx, int *nh_idx, hicn_face_id_t *outface) { hicn_dpo_ctx_t *dpo_ctx = hicn_strategy_dpo_ctx_get (dpo_idx); @@ -61,8 +61,7 @@ hicn_select_next_hop_rr (index_t dpo_idx, int *nh_idx, hicn_face_id_t* outface) hicn_strategy_rr_ctx_t *hicn_strategy_rr_ctx = (hicn_strategy_rr_ctx_t *) dpo_ctx->data; - *outface = - dpo_ctx->next_hops[hicn_strategy_rr_ctx->current_nhop]; + *outface = dpo_ctx->next_hops[hicn_strategy_rr_ctx->current_nhop]; hicn_strategy_rr_ctx->current_nhop = (hicn_strategy_rr_ctx->current_nhop + 1) % dpo_ctx->entry_count; @@ -71,11 +70,13 @@ hicn_select_next_hop_rr (index_t dpo_idx, int *nh_idx, hicn_face_id_t* outface) } void -hicn_add_interest_rr (index_t dpo_ctx_idx, hicn_hash_entry_t * hash_entry) +hicn_add_interest_rr (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_rr_get_type (), 0, 0, dpo_ctx_idx }; + dpo_id_t hicn_dpo_id = { .dpoi_type = hicn_dpo_strategy_rr_get_type (), + .dpoi_proto = 0, + .dpoi_next_node = 0, + .dpoi_index = dpo_ctx_idx }; hicn_strategy_dpo_ctx_lock (&hicn_dpo_id); hash_entry->vft_id = hicn_dpo_get_vft_id (&hicn_dpo_id); } @@ -91,10 +92,9 @@ hicn_receive_data_rr (index_t dpo_idx, int nh_idx) { } - /* packet trace format function */ u8 * -hicn_strategy_format_trace_rr (u8 * s, hicn_strategy_trace_t * t) +hicn_strategy_format_trace_rr (u8 *s, hicn_strategy_trace_t *t) { s = format (s, "Strategy_rr: pkt: %d, sw_if_index %d, next index %d", (int) t->pkt_type, t->sw_if_index, t->next_index); @@ -102,14 +102,14 @@ hicn_strategy_format_trace_rr (u8 * s, hicn_strategy_trace_t * t) } u8 * -hicn_strategy_format_rr (u8 * s, va_list * ap) +hicn_strategy_format_rr (u8 *s, va_list *ap) { u32 indent = va_arg (*ap, u32); - s = - format (s, - "Round Robin: next hop is chosen ciclying between all the available next hops, one after the other.\n", - indent); + s = format (s, + "Round Robin: next hop is chosen ciclying between all the " + "available next hops, one after the other.\n", + indent); return (s); } -- cgit 1.2.3-korg