};
/*
- * Keep these values sematically the same as BIER output
+ * Keep these values semantically the same as BIER output
*/
#define foreach_bier_output_next \
_(DROP, "bier-drop")
extern vlib_combined_counter_main_t bier_fmask_counters;
/**
- * @brief Packet trace recoed for a BIER output
+ * @brief Packet trace record for a BIER output
*/
typedef struct bier_output_trace_t_
{
u32 next_index;
index_t bfm_index;
+ mpls_label_t bfm_label;
} bier_output_trace_t;
static uword
u32 n_left_from, next_index, * from, * to_next;
u32 thread_index;
- thread_index = vlib_get_thread_index ();
+ thread_index = vm->thread_index;
from = vlib_frame_vector_args (from_frame);
n_left_from = from_frame->n_vectors;
bier_bit_string_init_from_hdr(bh0, &bbs);
/*
- * In the BIER Lookup node we squirelled away the
+ * In the BIER Lookup node we squirrelled away the
* BIER fmask index as the adj index
*/
bfmi0 = vnet_buffer (b0)->ip.adj_index[VLIB_TX];
tr = vlib_add_trace (vm, node, b0, sizeof (*tr));
tr->next_index = next0;
tr->bfm_index = bfmi0;
+ tr->bfm_label = bfm0->bfm_label;
}
vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
bier_output_trace_t * t = va_arg (*args, bier_output_trace_t *);
- s = format (s, " next [%d], BFM index %d",
- t->next_index, t->bfm_index);
+ s = format (s, " next [%d], BFM index %d label:%x",
+ t->next_index, t->bfm_index, t->bfm_label);
return s;
}