mirror/NetGuard
1
0
Fork 0
mirror of https://github.com/M66B/NetGuard.git synced 2025-03-10 06:03:10 +00:00
Code Issues Releases Wiki Activity

Yield while reading TUN / UDP socket

Browse source
This commit is contained in:
M66B 2019-07-28 11:56:31 +02:00
parent 7dc998150a
commit 8b6d0146ef
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/jni/netguard/netguard.h
View file

@ -41,6 +41,8 @@
#define EPOLL_EVENTS 20 #define EPOLL_EVENTS 20
#define EPOLL_MIN_CHECK 100 // milliseconds #define EPOLL_MIN_CHECK 100 // milliseconds
#define TUN_YIELD 10 // packets
#define ICMP4_MAXMSG (IP_MAXPACKET - 20 - 8) // bytes (socket) #define ICMP4_MAXMSG (IP_MAXPACKET - 20 - 8) // bytes (socket)
#define ICMP6_MAXMSG (IPV6_MAXPACKET - 40 - 8) // bytes (socket) #define ICMP6_MAXMSG (IPV6_MAXPACKET - 40 - 8) // bytes (socket)
#define UDP4_MAXMSG (IP_MAXPACKET - 20 - 8) // bytes (socket) #define UDP4_MAXMSG (IP_MAXPACKET - 20 - 8) // bytes (socket)
@ -51,6 +53,7 @@
#define UDP_TIMEOUT_53 15 // seconds #define UDP_TIMEOUT_53 15 // seconds
#define UDP_TIMEOUT_ANY 300 // seconds #define UDP_TIMEOUT_ANY 300 // seconds
#define UDP_KEEP_TIMEOUT 60 // seconds #define UDP_KEEP_TIMEOUT 60 // seconds
#define UDP_YIELD 10 // packets
#define TCP_INIT_TIMEOUT 20 // seconds ~net.inet.tcp.keepinit #define TCP_INIT_TIMEOUT 20 // seconds ~net.inet.tcp.keepinit
#define TCP_IDLE_TIMEOUT 3600 // seconds ~net.inet.tcp.keepidle #define TCP_IDLE_TIMEOUT 3600 // seconds ~net.inet.tcp.keepidle

14
app/src/main/jni/netguard/session.c
View file

@ -222,9 +222,13 @@ void *handle_events(void *a) {
(ev[i].events & EPOLLERR) != 0, (ev[i].events & EPOLLERR) != 0,
(ev[i].events & EPOLLHUP) != 0); (ev[i].events & EPOLLHUP) != 0);
while (!error && is_readable(args->tun)) int count = 0;
while (count < TUN_YIELD && !error && !args->ctx->stopping &&
is_readable(args->tun)) {
count++;
if (check_tun(args, &ev[i], epoll_fd, sessions, maxsessions) < 0) if (check_tun(args, &ev[i], epoll_fd, sessions, maxsessions) < 0)
error = 1; error = 1;
}
} else { } else {
// Check downstream // Check downstream
@ -243,9 +247,13 @@ void *handle_events(void *a) {
session->protocol == IPPROTO_ICMPV6) session->protocol == IPPROTO_ICMPV6)
check_icmp_socket(args, &ev[i]); check_icmp_socket(args, &ev[i]);
else if (session->protocol == IPPROTO_UDP) { else if (session->protocol == IPPROTO_UDP) {
while (!(ev[i].events & EPOLLERR) && (ev[i].events & EPOLLIN) && int count = 0;
is_readable(session->socket)) while (count < UDP_YIELD && !args->ctx->stopping &&
!(ev[i].events & EPOLLERR) && (ev[i].events & EPOLLIN) &&
is_readable(session->socket)) {
count++;
check_udp_socket(args, &ev[i]); check_udp_socket(args, &ev[i]);
}
} else if (session->protocol == IPPROTO_TCP) } else if (session->protocol == IPPROTO_TCP)
check_tcp_socket(args, &ev[i], epoll_fd); check_tcp_socket(args, &ev[i], epoll_fd);
} }