Browse Source

Warnign fixes

pull/806/head
Luca Deri 3 years ago
parent
commit
d4e0f5a445
  1. 8
      src/edge_utils.c
  2. 2
      src/random_numbers.c

8
src/edge_utils.c

@ -2899,7 +2899,7 @@ int fetch_and_eventually_process_data (n2n_edge_t *eee, SOCKET sock,
uint8_t *pktbuf, uint16_t *expected, uint16_t *position, uint8_t *pktbuf, uint16_t *expected, uint16_t *position,
time_t now) { time_t now) {
size_t bread = 0; ssize_t bread = 0;
if((!eee->conf.connect_tcp) if((!eee->conf.connect_tcp)
#ifndef SKIP_MULTICAST_PEERS_DISCOVERY #ifndef SKIP_MULTICAST_PEERS_DISCOVERY
@ -3488,9 +3488,9 @@ static int routectl (int cmd, int flags, n2n_route_t *route, int if_idx) {
/* ************************************** */ /* ************************************** */
static int edge_init_routes_linux (n2n_edge_t *eee, n2n_route_t *routes, uint16_t num_routes) {
#ifdef __linux__ #ifdef __linux__
static int edge_init_routes_linux (n2n_edge_t *eee, n2n_route_t *routes, uint16_t num_routes) {
int i; int i;
for(i = 0; i<num_routes; i++) { for(i = 0; i<num_routes; i++) {
n2n_route_t *route = &routes[i]; n2n_route_t *route = &routes[i];
@ -3573,10 +3573,10 @@ static int edge_init_routes_linux (n2n_edge_t *eee, n2n_route_t *routes, uint16_
return(-1); return(-1);
} }
} }
#endif
return(0); return(0);
} }
#endif
/* ************************************** */ /* ************************************** */

2
src/random_numbers.c

@ -98,9 +98,9 @@ uint64_t n2n_seed (void) {
uint64_t seed = 0; /* this could even go uninitialized */ uint64_t seed = 0; /* this could even go uninitialized */
uint64_t ret = 0; /* this could even go uninitialized */ uint64_t ret = 0; /* this could even go uninitialized */
size_t i;
#ifdef SYS_getrandom #ifdef SYS_getrandom
size_t i;
int rc = -1; int rc = -1;
for(i = 0; (i < RND_RETRIES) && (rc != sizeof(seed)); i++) { for(i = 0; (i < RND_RETRIES) && (rc != sizeof(seed)); i++) {
rc = syscall (SYS_getrandom, &seed, sizeof(seed), GRND_NONBLOCK); rc = syscall (SYS_getrandom, &seed, sizeof(seed), GRND_NONBLOCK);

Loading…
Cancel
Save