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

Clean up coverity warnings, VPP-486

Browse Source 
Change-Id: I709e7cf0bb52d8e6cdc9ddb3b7648660204aa3bd
Signed-off-by: Dave Barach <dave@barachs.net>
This commit is contained in:
Dave Barach
2016-11-11 17:27:51 -05:00
committed by Damjan Marion
parent 4cecc611be
commit f5179c7144
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
vlib-api/vlibapi/api_shared.c
View File

@ -896,6 +896,7 @@ vl_msg_api_process_file (vlib_main_t * vm, u8 * filename,
|| (am->msg_endian_handlers[msg_id] == 0)) || (am->msg_endian_handlers[msg_id] == 0))
{ {
vlib_cli_output (vm, "Ugh: msg id %d no endian swap\n", msg_id); vlib_cli_output (vm, "Ugh: msg id %d no endian swap\n", msg_id);
munmap (hp, file_size);
return; return;
} }
endian_fp = am->msg_endian_handlers[msg_id]; endian_fp = am->msg_endian_handlers[msg_id];

9
vnet/vnet/ip/ip6_neighbor.c
View File

@ -1881,11 +1881,10 @@ ip6_neighbor_sw_interface_add_del (vnet_main_t * vnm,
a->min_delay_between_radv = MIN_DELAY_BETWEEN_RAS; a->min_delay_between_radv = MIN_DELAY_BETWEEN_RAS;
a->max_delay_between_radv = MAX_DELAY_BETWEEN_RAS; a->max_delay_between_radv = MAX_DELAY_BETWEEN_RAS;
a->max_rtr_default_lifetime = MAX_DEF_RTR_LIFETIME; a->max_rtr_default_lifetime = MAX_DEF_RTR_LIFETIME;
a->seed = random_default_seed(); a->seed = (u32) clib_cpu_time_now();
(void) random_u32 (&a->seed);
/* for generating random interface ids */ a->randomizer = clib_cpu_time_now();
a->randomizer = 0x1119194911191949ULL; (void) random_u64 (&a->randomizer);
a->randomizer = random_u64 ((u32 *)&a->randomizer);
a->initial_adverts_count = MAX_INITIAL_RTR_ADVERTISEMENTS ; a->initial_adverts_count = MAX_INITIAL_RTR_ADVERTISEMENTS ;
a->initial_adverts_sent = a->initial_adverts_count-1; a->initial_adverts_sent = a->initial_adverts_count-1;

17
vppinfra/vppinfra/random.h
View File

@ -119,17 +119,14 @@ random_default_seed (void)
#endif #endif
/** \brief 64-bit random number generator /** \brief 64-bit random number generator
* Again, constants courtesy of Donald Knuth.
created via two calls to random_u32(). Quick and dirty. *
*/ */
always_inline u64 always_inline u64
random_u64 (u32 * seed) random_u64 (u64 * seed)
{ {
u64 result; *seed = 6364136223846793005ULL * *seed + 1442695040888963407ULL;
return *seed;
result = (u64) random_u32 (seed) << 32;
result |= random_u32 (seed);
return result;
} }
/** \brief machine word size random number generator */ /** \brief machine word size random number generator */
@ -138,7 +135,7 @@ always_inline uword
random_uword (u32 * seed) random_uword (u32 * seed)
{ {
if (sizeof (uword) == sizeof (u64)) if (sizeof (uword) == sizeof (u64))
return random_u64 (seed); return random_u64 ((u64 *) seed);
else else
return random_u32 (seed); return random_u32 (seed);
} }