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

Remove while(1)

Browse Source
This commit is contained in:
Adrien Gallouët
2017-01-19 12:47:06 +00:00
parent 0664fc3b21
commit 9cebabfe01
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main.c
View File

@@ -439,28 +439,32 @@ main(int argc, char **argv)
} }
if (FD_ISSET(mud_fd, &rfds)) { if (FD_ISSET(mud_fd, &rfds)) {
while (1) { size_t size = 0;
const int size = mud_recv(mud, buf, sizeof(buf));
if (size <= 0) { while (sizeof(buf) - size >= gt.mtu) {
if (size == -1 && errno != EAGAIN) const int r = mud_recv(mud, &buf[size], sizeof(buf) - size);
if (r <= 0) {
if (r == -1 && errno != EAGAIN)
perror("mud_recv"); perror("mud_recv");
break; break;
} }
int p = 0; size += r;
}
while (p < size) { int p = 0;
struct ip_common ic;
if ((ip_get_common(&ic, &buf[p], size - p)) || while (p < size) {
(ic.size > size - p)) struct ip_common ic;
break;
tun_write(tun_fd, &buf[p], ic.size); if ((ip_get_common(&ic, &buf[p], size - p)) ||
(ic.size > size - p))
break;
p += ic.size; tun_write(tun_fd, &buf[p], ic.size);
}
p += ic.size;
} }
} }
} }