From 34883ae53b4aa7be68d9750fa0f33fc7a5c8f17a Mon Sep 17 00:00:00 2001 From: Alberto Compagno Date: Fri, 7 Jun 2019 20:20:08 +0200 Subject: [HICN-216] Fixed dpo initializatino Change-Id: I45104ab815cf93969d1f25a77ea7e79ef295acdc Signed-off-by: Alberto Compagno --- hicn-plugin/src/strategies/dpo_mw.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'hicn-plugin/src/strategies/dpo_mw.c') diff --git a/hicn-plugin/src/strategies/dpo_mw.c b/hicn-plugin/src/strategies/dpo_mw.c index 80cbcf2ee..0014c2b7f 100644 --- a/hicn-plugin/src/strategies/dpo_mw.c +++ b/hicn-plugin/src/strategies/dpo_mw.c @@ -161,19 +161,13 @@ hicn_strategy_mw_ctx_create (dpo_proto_t proto, const dpo_id_t * next_hop, { hicn_strategy_mw_ctx_t *hicn_strategy_mw_ctx; int ret = HICN_ERROR_NONE, i; - dpo_id_t invalid = NEXT_HOP_INVALID; /* Allocate a hicn_dpo_ctx on the vpp pool and initialize it */ pool_get (hicn_strategy_mw_ctx_pool, hicn_strategy_mw_ctx); *dpo_idx = hicn_strategy_mw_ctx_get_index (hicn_strategy_mw_ctx); - for (int i = 0; i < HICN_PARAM_FIB_ENTRY_NHOPS_MAX; i++) - { - hicn_strategy_mw_ctx->default_ctx.next_hops[i] = invalid; - } - hicn_strategy_mw_ctx->default_ctx.entry_count = 0; - hicn_strategy_mw_ctx->default_ctx.locks = 0; + init_dpo_ctx (&(hicn_strategy_mw_ctx->default_ctx)); for (i = 0; i < HICN_PARAM_FIB_ENTRY_NHOPS_MAX && i < nh_len; i++) { @@ -219,8 +213,8 @@ hicn_strategy_mw_ctx_add_nh (const dpo_id_t * nh, index_t dpo_idx) { /* If face is marked as deleted, ignore it */ hicn_face_t *face = - hicn_dpoi_get_from_idx (hicn_strategy_mw_ctx->default_ctx. - next_hops[i].dpoi_index); + hicn_dpoi_get_from_idx (hicn_strategy_mw_ctx-> + default_ctx.next_hops[i].dpoi_index); if (face->shared.flags & HICN_FACE_FLAGS_DELETED) { continue; @@ -265,8 +259,8 @@ hicn_strategy_mw_ctx_del_nh (hicn_face_id_t face_id, index_t dpo_idx, face_id) { nh_id = i; - hicn_face_unlock (&hicn_strategy_mw_ctx-> - default_ctx.next_hops[i]); + hicn_face_unlock (&hicn_strategy_mw_ctx->default_ctx. + next_hops[i]); hicn_strategy_mw_ctx->default_ctx.next_hops[i] = invalid; hicn_strategy_mw_ctx->default_ctx.entry_count--; } -- cgit 1.2.3-korg