Change-Id: I657bade082f9f754b294cd5f23ecfad4f0f46265
Signed-off-by: Neale Ranns <nranns@cisco.com>
brpath->frp_flags = FIB_ROUTE_PATH_BIER_FMASK;
vec_validate(brpath->frp_label_stack,
brpath->frp_flags = FIB_ROUTE_PATH_BIER_FMASK;
vec_validate(brpath->frp_label_stack,
- mp->br_paths[ii].n_labels);
+ mp->br_paths[ii].n_labels - 1);
for (jj = 0; jj < mp->br_paths[ii].n_labels; jj++)
{
brpath->frp_label_stack[jj] =
for (jj = 0; jj < mp->br_paths[ii].n_labels; jj++)
{
brpath->frp_label_stack[jj] =
static index_t
bier_disp_table_lookup_hton(index_t bdti,
static index_t
bier_disp_table_lookup_hton(index_t bdti,
- return (bier_disp_table_lookup(bdti, clib_host_to_net_u16(src)));
+ bier_hdr_src_id_t src = bp;
+
+ return (bier_disp_table_lookup(bdti, clib_host_to_net_u32(src)));
static inline index_t
bier_disp_table_lookup (index_t bdti,
static inline index_t
bier_disp_table_lookup (index_t bdti,
{
bier_disp_table_t *bdt;
{
bier_disp_table_t *bdt;
.frp_rpf_id = 9, // some non-zero value
.frp_flags = FIB_ROUTE_PATH_RPF_ID,
};
.frp_rpf_id = 9, // some non-zero value
.frp_flags = FIB_ROUTE_PATH_RPF_ID,
};
+ bier_hdr_src_id_t src = 99;
vec_add1(rpaths, path_via_mfib);
bier_disp_table_entry_path_add(bier_disp_tbl_id, src,
BIER_HDR_PROTO_IPV4, rpaths);
vec_add1(rpaths, path_via_mfib);
bier_disp_table_entry_path_add(bier_disp_tbl_id, src,
BIER_HDR_PROTO_IPV4, rpaths);
vlib_cli_command_t * cmd)
{
clib_error_t * error = NULL;
vlib_cli_command_t * cmd)
{
clib_error_t * error = NULL;
- fib_route_path_t brp = {
+ fib_route_path_t *brps = NULL, brp = {
.frp_flags = FIB_ROUTE_PATH_BIER_FMASK,
};
bier_table_id_t bti = {
.frp_flags = FIB_ROUTE_PATH_BIER_FMASK,
};
bier_table_id_t bti = {
bti.bti_hdr_len = bier_hdr_bit_len_to_id(hdr_len);
// FIXME
bti.bti_type = BIER_TABLE_MPLS_SPF;
bti.bti_hdr_len = bier_hdr_bit_len_to_id(hdr_len);
// FIXME
bti.bti_type = BIER_TABLE_MPLS_SPF;
bp = BIER_BP_INVALID;
bti = bei = INDEX_INVALID;
bp = BIER_BP_INVALID;
bti = bei = INDEX_INVALID;
+ flags = BIER_SHOW_BRIEF;
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
if (unformat (input, "%d %d", &bti, &bp))
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
if (unformat (input, "%d %d", &bti, &bp))
- FIB_TEST_LB((DPO_LOAD_BALANCE == dpo->dpoi_type),
- "Entry links to %U",
- format_dpo_type, dpo->dpoi_type);
- lb = load_balance_get(dpo->dpoi_index);
+ if (FIB_TEST_I((DPO_LOAD_BALANCE == dpo->dpoi_type),
+ "Entry links to %U",
+ format_dpo_type, dpo->dpoi_type))
+ {
+ lb = load_balance_get(dpo->dpoi_index);
- res = fib_test_validate_lb_v(lb, n_buckets, &ap);
+ res = fib_test_validate_lb_v(lb, n_buckets, &ap);
+ }
+ else
+ {
+ res = !0;
+ }