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

Try to be more robust on restart but accept some lost for now

Browse Source
This commit is contained in:
angt
2015-11-17 21:04:26 +01:00
parent 286f54aed4
commit bfcf38f380
1 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/main.c
View File

@@ -658,7 +658,7 @@ int main (int argc, char **argv)
return 1; return 1;
} }
while (1) { while (!gt_close) {
sock.fd = listener?sk_accept(fd):sk_create(ai, sk_connect); sock.fd = listener?sk_accept(fd):sk_create(ai, sk_connect);
if (sock.fd==-1) { if (sock.fd==-1) {
@@ -703,14 +703,16 @@ int main (int argc, char **argv)
int stop_loop = 0; int stop_loop = 0;
buffer_format(&sock.write.buf);
buffer_format(&sock.read.buf);
while (1) { while (1) {
if (gt_close) if (gt_close)
stop_loop = 1; stop_loop = 1;
if (stop_loop) { if (stop_loop) {
if (((stop_loop>>1)==3) && if (((stop_loop&(1<<2)) || !buffer_read_size(&sock.write.buf)) &&
(buffer_read_size(&sock.write.buf)==0) && ((stop_loop&(1<<1)) || !buffer_read_size(&sock.read.buf)))
(buffer_read_size(&sock.read.buf)==0))
goto restart; goto restart;
FD_CLR(tun.fd, &rfds); FD_CLR(tun.fd, &rfds);
} else { } else {
@@ -719,7 +721,9 @@ int main (int argc, char **argv)
FD_SET(sock.fd, &rfds); FD_SET(sock.fd, &rfds);
if (select(sock.fd+1, &rfds, &wfds, NULL, NULL)==-1 && errno!=EINTR) { if (select(sock.fd+1, &rfds, &wfds, NULL, NULL)==-1) {
if (errno==EINTR)
continue;
perror("select"); perror("select");
return 1; return 1;
} }
@@ -773,29 +777,27 @@ int main (int argc, char **argv)
FD_CLR(sock.fd, &wfds); FD_CLR(sock.fd, &wfds);
if (buffer_read_size(&sock.write.buf)) { if (buffer_read_size(&sock.write.buf)) {
ssize_t r = fd_write(sock.fd, sock.write.buf.read, buffer_read_size(&sock.write.buf)); ssize_t r = fd_write(sock.fd, sock.write.buf.read,
buffer_read_size(&sock.write.buf));
if (r==-1) if (r==-1)
FD_SET(sock.fd, &wfds); FD_SET(sock.fd, &wfds);
if (!r) { if (!r)
stop_loop |= (1<<2); stop_loop |= (1<<2);
buffer_format(&sock.write.buf);
}
if (r>0) if (r>0)
sock.write.buf.read += r; sock.write.buf.read += r;
} else { } else {
if (stop_loop) { if (stop_loop)
stop_loop |= (1<<2);
shutdown(sock.fd, SHUT_WR); shutdown(sock.fd, SHUT_WR);
}
} }
buffer_shift(&sock.read.buf); buffer_shift(&sock.read.buf);
if (FD_ISSET(sock.fd, &rfds)) { if (FD_ISSET(sock.fd, &rfds)) {
ssize_t r = fd_read(sock.fd, sock.read.buf.write, buffer_write_size(&sock.read.buf)); ssize_t r = fd_read(sock.fd, sock.read.buf.write,
buffer_write_size(&sock.read.buf));
if (!r) if (!r)
stop_loop |= (1<<1); stop_loop |= (1<<1);
@@ -815,11 +817,8 @@ int main (int argc, char **argv)
if (!ip_size) if (!ip_size)
goto restart; goto restart;
if (ip_size<0 || (size_t)ip_size+16>size) { if (ip_size<0 || (size_t)ip_size+16>size)
if (stop_loop&(1<<1))
buffer_format(&sock.read.buf);
break; break;
}
if (decrypt_packet(&ctx, tunw.buf, ip_size, &sock.read.buf)) { if (decrypt_packet(&ctx, tunw.buf, ip_size, &sock.read.buf)) {
gt_log("%s: message could not be verified!\n", sockname); gt_log("%s: message could not be verified!\n", sockname);
@@ -855,9 +854,6 @@ int main (int argc, char **argv)
close(sock.fd); close(sock.fd);
sock.fd = -1; sock.fd = -1;
} }
if (gt_close)
break;
} }
freeaddrinfo(ai); freeaddrinfo(ai);