ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VPP-889: MAP Stats API/CLI crashes when no domains.

Browse Source 
Change-Id: Ib7824bfc08cb3c8f20258379e1a1f2c159c4f687
Signed-off-by: Ole Troan <ot@cisco.com>
This commit is contained in:
Ole Troan
2017-06-26 18:12:37 +02:00
parent 04ffd0ad83
commit c08b0965d7
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/vnet/map/map.c
View File

@ -1106,7 +1106,10 @@ show_map_stats_command_fn (vlib_main_t * vm, unformat_input_t * input,
map_domain_t *d;
int domains = 0, rules = 0, domaincount = 0, rulecount = 0;
if (pool_elts (mm->domains) == 0)
vlib_cli_output (vm, "No MAP domains are configured...");
{
vlib_cli_output (vm, "No MAP domains are configured...");
return 0;
}
/* *INDENT-OFF* */
pool_foreach(d, mm->domains, ({

7
src/vnet/map/map_api.c
View File

@ -203,6 +203,12 @@ vl_api_map_summary_stats_t_handler (vl_api_map_summary_stats_t * mp)
rmp->context = mp->context;
rmp->retval = 0;
if (pool_elts (mm->domains) == 0)
{
rmp->retval = -1;
goto out;
}
memset (total_pkts, 0, sizeof (total_pkts));
memset (total_bytes, 0, sizeof (total_bytes));
@ -239,6 +245,7 @@ vl_api_map_summary_stats_t_handler (vl_api_map_summary_stats_t * mp)
clib_host_to_net_u64 (map_error_counter_get
(ip4_map_node.index, MAP_ERROR_DECAP_SEC_CHECK));
out:
vl_msg_api_send_shmem (q, (u8 *) & rmp);
}