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_mw.c | 43 ++++++++++++++++---------------- 1 file changed, 22 insertions(+), 21 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 fe4d5896a..594135c1e 100644 --- a/hicn-plugin/src/strategies/strategy_mw.c +++ b/hicn-plugin/src/strategies/strategy_mw.c @@ -22,14 +22,13 @@ /* Simple strategy that chooses the next hop with the maximum weight */ /* It does not require to exend the hicn_dpo */ void hicn_receive_data_mw (index_t dpo_idx, int nh_idx); -void hicn_add_interest_mw (index_t dpo_idx, hicn_hash_entry_t * pit_entry); +void hicn_add_interest_mw (index_t dpo_idx, hicn_hash_entry_t *pit_entry); void hicn_on_interest_timeout_mw (index_t dpo_idx); u32 hicn_select_next_hop_mw (index_t dpo_idx, int *nh_idx, - hicn_face_id_t* outface); + hicn_face_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); - +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, @@ -49,9 +48,10 @@ hicn_mw_strategy_get_vft (void) return &hicn_strategy_mw_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_mw (index_t dpo_idx, int *nh_idx, hicn_face_id_t* outface) +hicn_select_next_hop_mw (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); @@ -65,10 +65,10 @@ hicn_select_next_hop_mw (index_t dpo_idx, int *nh_idx, hicn_face_id_t* outface) for (int i = 0; i < dpo_ctx->entry_count; i++) { if (hicn_strategy_mw_ctx->weight[next_hop_index] < - hicn_strategy_mw_ctx->weight[i]) - { - next_hop_index = i; - } + hicn_strategy_mw_ctx->weight[i]) + { + next_hop_index = i; + } } *outface = dpo_ctx->next_hops[next_hop_index]; @@ -77,11 +77,13 @@ hicn_select_next_hop_mw (index_t dpo_idx, int *nh_idx, hicn_face_id_t* outface) } void -hicn_add_interest_mw (index_t dpo_ctx_idx, hicn_hash_entry_t * hash_entry) +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 }; + dpo_id_t hicn_dpo_id = { .dpoi_type = hicn_dpo_strategy_mw_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); } @@ -97,10 +99,9 @@ hicn_receive_data_mw (index_t dpo_idx, int nh_idx) { } - /* packet trace format function */ u8 * -hicn_strategy_format_trace_mw (u8 * s, hicn_strategy_trace_t * t) +hicn_strategy_format_trace_mw (u8 *s, hicn_strategy_trace_t *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); @@ -108,14 +109,14 @@ hicn_strategy_format_trace_mw (u8 * s, hicn_strategy_trace_t * t) } u8 * -hicn_strategy_format_mw (u8 * s, va_list * ap) +hicn_strategy_format_mw (u8 *s, va_list *ap) { 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); + 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); } -- cgit 1.2.3-korg