j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

recv() and recvfrom() return int, do not prematurely cast the return value.

Browse source
This commit is contained in:
Guus Sliepen 2009-12-19 20:52:19 +01:00
parent 0bfd69a273
commit 74e50d52e0
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/meta.c
View file

@ -76,7 +76,7 @@ void broadcast_meta(connection_t *from, const char *buffer, int length) {
} }
bool receive_meta(connection_t *c) { bool receive_meta(connection_t *c) {
size_t inlen; int inlen;
char inbuf[MAXBUFSIZE]; char inbuf[MAXBUFSIZE];
char *bufp = inbuf, *endp; char *bufp = inbuf, *endp;
@ -117,7 +117,7 @@ bool receive_meta(connection_t *c) {
bufp = endp; bufp = endp;
} else { } else {
size_t outlen = inlen; size_t outlen = inlen;
ifdebug(META) logger(LOG_DEBUG, "Received encrypted %zu bytes", inlen); ifdebug(META) logger(LOG_DEBUG, "Received encrypted %d bytes", inlen);
evbuffer_expand(c->buffer->input, c->buffer->input->off + inlen); evbuffer_expand(c->buffer->input, c->buffer->input->off + inlen);
if(!cipher_decrypt(&c->incipher, bufp, inlen, c->buffer->input->buffer + c->buffer->input->off, &outlen, false) || inlen != outlen) { if(!cipher_decrypt(&c->incipher, bufp, inlen, c->buffer->input->buffer + c->buffer->input->off, &outlen, false) || inlen != outlen) {

7
src/net_packet.c
View file

@ -533,15 +533,18 @@ void handle_incoming_vpn_data(int sock, short events, void *data) {
sockaddr_t from; sockaddr_t from;
socklen_t fromlen = sizeof from; socklen_t fromlen = sizeof from;
node_t *n; node_t *n;
int len;
pkt.len = recvfrom(sock, (char *) &pkt.seqno, MAXSIZE, 0, &from.sa, &fromlen); len = recvfrom(sock, (char *) &pkt.seqno, MAXSIZE, 0, &from.sa, &fromlen);
if(pkt.len < 0) { if(len <= 0 || len > MAXSIZE) {
if(!sockwouldblock(sockerrno)) if(!sockwouldblock(sockerrno))
logger(LOG_ERR, "Receiving packet failed: %s", sockstrerror(sockerrno)); logger(LOG_ERR, "Receiving packet failed: %s", sockstrerror(sockerrno));
return; return;
} }
pkt.len = len;
sockaddrunmap(&from); /* Some braindead IPv6 implementations do stupid things. */ sockaddrunmap(&from); /* Some braindead IPv6 implementations do stupid things. */
n = lookup_node_udp(&from); n = lookup_node_udp(&from);