Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
FIB: encode the label stack in the FIB path during table dump
[vpp.git]
/
src
/
vnet
/
mpls
/
mpls_api.c
diff --git
a/src/vnet/mpls/mpls_api.c
b/src/vnet/mpls/mpls_api.c
index
84532bf
..
4ac5ea7
100644
(file)
--- a/
src/vnet/mpls/mpls_api.c
+++ b/
src/vnet/mpls/mpls_api.c
@@
-202,7
+202,7
@@
mpls_route_add_del_t_handler (vnet_main_t * vnm,
return (rv);
ip46_address_t nh;
return (rv);
ip46_address_t nh;
- memset (&nh, 0, sizeof (nh));
+
clib_
memset (&nh, 0, sizeof (nh));
if (DPO_PROTO_IP4 == mp->mr_next_hop_proto)
memcpy (&nh.ip4, mp->mr_next_hop, sizeof (nh.ip4));
if (DPO_PROTO_IP4 == mp->mr_next_hop_proto)
memcpy (&nh.ip4, mp->mr_next_hop, sizeof (nh.ip4));
@@
-316,7
+316,7
@@
vl_api_mpls_tunnel_add_del_t_handler (vl_api_mpls_tunnel_add_del_t * mp)
fib_route_path_t rpath, *rpaths = NULL;
int ii, rv = 0;
fib_route_path_t rpath, *rpaths = NULL;
int ii, rv = 0;
- memset (&rpath, 0, sizeof (rpath));
+
clib_
memset (&rpath, 0, sizeof (rpath));
stats_dslock_with_hint (1 /* release hint */ , 5 /* tag */ );
stats_dslock_with_hint (1 /* release hint */ , 5 /* tag */ );
@@
-450,7
+450,7
@@
send_mpls_tunnel_entry (u32 mti, void *arg)
n = fib_path_list_get_n_paths (mt->mt_path_list);
mp = vl_msg_api_alloc (sizeof (*mp) + n * sizeof (vl_api_fib_path_t));
n = fib_path_list_get_n_paths (mt->mt_path_list);
mp = vl_msg_api_alloc (sizeof (*mp) + n * sizeof (vl_api_fib_path_t));
- memset (mp, 0, sizeof (*mp) + n * sizeof (vl_api_fib_path_t));
+
clib_
memset (mp, 0, sizeof (*mp) + n * sizeof (vl_api_fib_path_t));
mp->_vl_msg_id = ntohs (VL_API_MPLS_TUNNEL_DETAILS);
mp->context = ctx->context;
mp->_vl_msg_id = ntohs (VL_API_MPLS_TUNNEL_DETAILS);
mp->context = ctx->context;
@@
-459,7
+459,8
@@
send_mpls_tunnel_entry (u32 mti, void *arg)
mp->mt_sw_if_index = ntohl (mt->mt_sw_if_index);
mp->mt_count = ntohl (n);
mp->mt_sw_if_index = ntohl (mt->mt_sw_if_index);
mp->mt_count = ntohl (n);
- fib_path_list_walk (mt->mt_path_list, fib_path_encode, &api_rpaths);
+ fib_path_list_walk_w_ext (mt->mt_path_list,
+ &mt->mt_path_exts, fib_path_encode, &api_rpaths);
fp = mp->mt_paths;
vec_foreach (api_rpath, api_rpaths)
fp = mp->mt_paths;
vec_foreach (api_rpath, api_rpaths)
@@
-504,7
+505,7
@@
send_mpls_fib_details (vpe_api_main_t * am,
mp = vl_msg_api_alloc (sizeof (*mp) + path_count * sizeof (*fp));
if (!mp)
return;
mp = vl_msg_api_alloc (sizeof (*mp) + path_count * sizeof (*fp));
if (!mp)
return;
- memset (mp, 0, sizeof (*mp));
+
clib_
memset (mp, 0, sizeof (*mp));
mp->_vl_msg_id = ntohs (VL_API_MPLS_FIB_DETAILS);
mp->context = context;
mp->_vl_msg_id = ntohs (VL_API_MPLS_FIB_DETAILS);
mp->context = context;