From a161a6dedb1aa3aba00109d325d2909051a3c987 Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Tue, 14 Nov 2017 08:10:41 -0800 Subject: Ip6 dump not showing fib table names (VPP-1063) Change-Id: Idc7e7c35f17d514589d1264f1d1be664192ee586 Signed-off-by: Neale Ranns --- src/vnet/fib/fib_path.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/vnet/fib') diff --git a/src/vnet/fib/fib_path.c b/src/vnet/fib/fib_path.c index 8dabfdf9674..79291ca8c9a 100644 --- a/src/vnet/fib/fib_path.c +++ b/src/vnet/fib/fib_path.c @@ -2609,17 +2609,16 @@ fib_path_encode (fib_node_index_t path_list_index, api_rpath->rpath.frp_preference = path->fp_preference; api_rpath->rpath.frp_proto = path->fp_nh_proto; api_rpath->rpath.frp_sw_if_index = ~0; - api_rpath->dpo = path->exclusive.fp_ex_dpo; + api_rpath->dpo = path->fp_dpo; + switch (path->fp_type) { case FIB_PATH_TYPE_RECEIVE: api_rpath->rpath.frp_addr = path->receive.fp_addr; api_rpath->rpath.frp_sw_if_index = path->receive.fp_interface; - api_rpath->dpo = path->fp_dpo; break; case FIB_PATH_TYPE_ATTACHED: api_rpath->rpath.frp_sw_if_index = path->attached.fp_interface; - api_rpath->dpo = path->fp_dpo; break; case FIB_PATH_TYPE_ATTACHED_NEXT_HOP: api_rpath->rpath.frp_sw_if_index = path->attached_next_hop.fp_interface; @@ -2633,7 +2632,6 @@ fib_path_encode (fib_node_index_t path_list_index, break; case FIB_PATH_TYPE_DEAG: api_rpath->rpath.frp_fib_index = path->deag.fp_tbl_id; - api_rpath->dpo = path->fp_dpo; break; case FIB_PATH_TYPE_RECURSIVE: api_rpath->rpath.frp_addr = path->recursive.fp_nh.fp_ip; @@ -2641,6 +2639,7 @@ fib_path_encode (fib_node_index_t path_list_index, default: break; } + return (FIB_PATH_LIST_WALK_CONTINUE); } -- cgit 1.2.3-korg