enoch/n2n
1
0
Fork 0
mirror of https://github.com/ntop/n2n.git synced 2024-09-19 16:41:11 +02:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

None of the callers of sendto_sock check the result, so make this clear in the function prototype

Browse Source
This commit is contained in:
Hamish Coleman 2022-05-19 23:10:35 +01:00
parent 46212656a5
commit 9e98023a3f
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/edge_utils.c
View File

@ -1071,7 +1071,7 @@ err_out:
/** Send a datagram to a socket defined by a n2n_sock_t */ /** Send a datagram to a socket defined by a n2n_sock_t */
static ssize_t sendto_sock (n2n_edge_t *eee, const void * buf, static void sendto_sock (n2n_edge_t *eee, const void * buf,
size_t len, const n2n_sock_t * dest) { size_t len, const n2n_sock_t * dest) {
struct sockaddr_in peer_addr; struct sockaddr_in peer_addr;
@ -1081,16 +1081,16 @@ static ssize_t sendto_sock (n2n_edge_t *eee, const void * buf,
// TODO: audit callers and confirm if this can ever happen // TODO: audit callers and confirm if this can ever happen
if(!eee) { if(!eee) {
traceEvent(TRACE_WARNING, "bad eee"); traceEvent(TRACE_WARNING, "bad eee");
return -1; return;
} }
if(!dest->family) if(!dest->family)
// invalid socket // invalid socket
return 0; return;
if(eee->sock < 0) if(eee->sock < 0)
// invalid socket file descriptor, e.g. TCP unconnected has fd of '-1' // invalid socket file descriptor, e.g. TCP unconnected has fd of '-1'
return 0; return;
// network order socket // network order socket
fill_sockaddr((struct sockaddr *) &peer_addr, sizeof(peer_addr), dest); fill_sockaddr((struct sockaddr *) &peer_addr, sizeof(peer_addr), dest);
@ -1109,7 +1109,7 @@ static ssize_t sendto_sock (n2n_edge_t *eee, const void * buf,
sent = sendto_fd(eee, (uint8_t*)&pktsize16, sizeof(pktsize16), &peer_addr, dest); sent = sendto_fd(eee, (uint8_t*)&pktsize16, sizeof(pktsize16), &peer_addr, dest);
if(sent <= 0) if(sent <= 0)
return -1; return;
// ...before sending the actual data // ...before sending the actual data
} }
sent = sendto_fd(eee, buf, len, &peer_addr, dest); sent = sendto_fd(eee, buf, len, &peer_addr, dest);
@ -1124,7 +1124,7 @@ static ssize_t sendto_sock (n2n_edge_t *eee, const void * buf,
#endif #endif
} }
return sent; return;
} }
@ -1301,7 +1301,7 @@ void send_register_super (n2n_edge_t *eee) {
} }
} }
/* sent = */ sendto_sock(eee, pktbuf, idx, &(eee->curr_sn->sock)); sendto_sock(eee, pktbuf, idx, &(eee->curr_sn->sock));
} }
@ -1337,7 +1337,7 @@ static void send_unregister_super (n2n_edge_t *eee) {
eee->conf.header_encryption_ctx_dynamic, eee->conf.header_iv_ctx_dynamic, eee->conf.header_encryption_ctx_dynamic, eee->conf.header_iv_ctx_dynamic,
time_stamp()); time_stamp());
/* sent = */ sendto_sock(eee, pktbuf, idx, &(eee->curr_sn->sock)); sendto_sock(eee, pktbuf, idx, &(eee->curr_sn->sock));
} }
@ -1438,7 +1438,7 @@ static void send_register (n2n_edge_t * eee,
eee->conf.header_encryption_ctx_dynamic, eee->conf.header_iv_ctx_dynamic, eee->conf.header_encryption_ctx_dynamic, eee->conf.header_iv_ctx_dynamic,
time_stamp()); time_stamp());
/* sent = */ sendto_sock(eee, pktbuf, idx, remote_peer); sendto_sock(eee, pktbuf, idx, remote_peer);
} }
/* ************************************** */ /* ************************************** */
@ -1483,7 +1483,7 @@ static void send_register_ack (n2n_edge_t * eee,
eee->conf.header_encryption_ctx_dynamic, eee->conf.header_iv_ctx_dynamic, eee->conf.header_encryption_ctx_dynamic, eee->conf.header_iv_ctx_dynamic,
time_stamp()); time_stamp());
/* sent = */ sendto_sock(eee, pktbuf, idx, remote_peer); sendto_sock(eee, pktbuf, idx, remote_peer);
} }
/* ************************************** */ /* ************************************** */
@ -1948,13 +1948,13 @@ static int send_packet (n2n_edge_t * eee,
// if no supernode around, foward the broadcast to all known peers // if no supernode around, foward the broadcast to all known peers
if(eee->sn_wait) { if(eee->sn_wait) {
HASH_ITER(hh, eee->known_peers, peer, tmp_peer) HASH_ITER(hh, eee->known_peers, peer, tmp_peer)
/* s = */ sendto_sock(eee, pktbuf, pktlen, &peer->sock); sendto_sock(eee, pktbuf, pktlen, &peer->sock);
return 0; return 0;
} }
// fall through otherwise // fall through otherwise
} }
/* s = */ sendto_sock(eee, pktbuf, pktlen, &destination); sendto_sock(eee, pktbuf, pktlen, &destination);
return 0; return 0;
} }