miegl/glorytun
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix conversion in src/bind.c

Browse Source 
Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët
2019-04-03 09:33:07 +00:00
parent 5c29753343
commit 86fe69d644
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/bind.c
View File

@@ -67,7 +67,7 @@ gt_setup_secretkey(struct mud *mud, const char *keyfile)
break; break;
} }
size += r; size += (size_t)r;
} }
close(fd); close(fd);
@@ -312,15 +312,15 @@ gt_bind(int argc, char **argv)
if (FD_ISSET(mud_fd, &rfds)) { if (FD_ISSET(mud_fd, &rfds)) {
const int r = mud_recv(mud, buf, sizeof(buf)); const int r = mud_recv(mud, buf, sizeof(buf));
if (ip_is_valid(buf, r)) if (r > 0 && ip_is_valid(buf, r))
tun_write(tun_fd, buf, r); tun_write(tun_fd, buf, (size_t)r);
} }
if (FD_ISSET(tun_fd, &rfds) && !mud_send_wait(mud)) { if (FD_ISSET(tun_fd, &rfds) && !mud_send_wait(mud)) {
struct ip_common ic; struct ip_common ic;
const int r = tun_read(tun_fd, buf, sizeof(buf)); const int r = tun_read(tun_fd, buf, sizeof(buf));
if (!ip_get_common(&ic, buf, r)) { if (r > 0 && !ip_get_common(&ic, buf, r)) {
// TODO: disable hash for now // TODO: disable hash for now
// unsigned char hash[crypto_shorthash_BYTES]; // unsigned char hash[crypto_shorthash_BYTES];
// crypto_shorthash(hash, (const unsigned char *)&ic, sizeof(ic), hashkey); // crypto_shorthash(hash, (const unsigned char *)&ic, sizeof(ic), hashkey);
@@ -328,7 +328,7 @@ gt_bind(int argc, char **argv)
unsigned h = 0; unsigned h = 0;
// memcpy(&h, hash, sizeof(h)); // memcpy(&h, hash, sizeof(h));
mud_send(mud, buf, r, (h << 8) | ic.tc); mud_send(mud, buf, (size_t)r, (h << 8) | ic.tc);
} }
} }
} }