diff options
| author |   Neale Ranns <nranns@cisco.com> | 2018-09-13 08:45:12 -0700 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2018-09-14 18:21:43 +0000 |
| commit | ef90ed08fbcde7535b4a789349b39dc25798c77d (patch) | |
| tree | 4d36c0fa1ddd39700c4979dbc12366a78a4175a5 /src/vnet/bier/bier_fmask.c | |
| parent | ccf444d50253325bd8a7b0dddc2f34f5586b5e45 (diff) | |
BIER API and load-balancing fixes
Change-Id: Ibda19d786070c942c75016ab568c8361de2f24af
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vnet/bier/bier_fmask.c')
| -rw-r--r-- | src/vnet/bier/bier_fmask.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/vnet/bier/bier_fmask.c b/src/vnet/bier/bier_fmask.c index 73f719460aa..cb61681385d 100644 --- a/src/vnet/bier/bier_fmask.c +++ b/src/vnet/bier/bier_fmask.c @@ -165,14 +165,14 @@ bier_fmask_child_remove (fib_node_index_t bfmi, static void bier_fmask_init (bier_fmask_t *bfm, const bier_fmask_id_t *fmid, - const fib_route_path_t *rpaths) + const fib_route_path_t *rpath) { const bier_table_id_t *btid; + fib_route_path_t *rpaths; mpls_label_t olabel; - ASSERT(1 == vec_len(rpaths)); memset(bfm, 0, sizeof(*bfm)); - + bfm->bfm_id = clib_mem_alloc(sizeof(*bfm->bfm_id)); fib_node_init(&bfm->bfm_node, FIB_NODE_TYPE_BIER_FMASK); @@ -188,9 +188,9 @@ bier_fmask_init (bier_fmask_t *bfm, if (!(bfm->bfm_flags & BIER_FMASK_FLAG_DISP)) { - if (NULL != rpaths->frp_label_stack) + if (NULL != rpath->frp_label_stack) { - olabel = rpaths->frp_label_stack[0].fml_value; + olabel = rpath->frp_label_stack[0].fml_value; vnet_mpls_uc_set_label(&bfm->bfm_label, olabel); vnet_mpls_uc_set_exp(&bfm->bfm_label, 0); vnet_mpls_uc_set_s(&bfm->bfm_label, 1); @@ -220,13 +220,15 @@ bier_fmask_init (bier_fmask_t *bfm, bfm->bfm_label = clib_host_to_net_u32(bfm->bfm_label); } + rpaths = NULL; + vec_add1(rpaths, *rpath); bfm->bfm_pl = fib_path_list_create((FIB_PATH_LIST_FLAG_SHARED | FIB_PATH_LIST_FLAG_NO_URPF), rpaths); bfm->bfm_sibling = fib_path_list_child_add(bfm->bfm_pl, FIB_NODE_TYPE_BIER_FMASK, bier_fmask_get_index(bfm)); - + vec_free(rpaths); bier_fmask_stack(bfm); } @@ -276,7 +278,7 @@ bier_fmask_lock (index_t bfmi) index_t bier_fmask_create_and_lock (const bier_fmask_id_t *fmid, - const fib_route_path_t *rpaths) + const fib_route_path_t *rpath) { bier_fmask_t *bfm; index_t bfmi; @@ -287,7 +289,7 @@ bier_fmask_create_and_lock (const bier_fmask_id_t *fmid, vlib_validate_combined_counter (&(bier_fmask_counters), bfmi); vlib_zero_combined_counter (&(bier_fmask_counters), bfmi); - bier_fmask_init(bfm, fmid, rpaths); + bier_fmask_init(bfm, fmid, rpath); bier_fmask_lock(bfmi); |