mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Use multiple epoll events 

Refs #431
This commit is contained in:
M66B 2016-06-25 09:12:54 +02:00
parent 711b86920b
commit 32304b549f
3 changed files with 47 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/jni/netguard/ip.c
View File

@ -131,12 +131,6 @@ void handle_ip(const struct arguments *args,
int flen = 0;
uint8_t *payload;
#ifdef PROFILE_EVENTS
float mselapsed;
struct timeval start, end;
gettimeofday(&start, NULL);
#endif
// Get protocol, addresses & payload
uint8_t version = (*pkt) >> 4;
if (version == 4) {
@ -300,14 +294,6 @@ void handle_ip(const struct arguments *args,
"Packet v%d %s/%u > %s/%u proto %d flags %s uid %d",
version, source, sport, dest, dport, protocol, flags, uid);
#ifdef PROFILE_EVENTS
gettimeofday(&end, NULL);
mselapsed = (end.tv_sec - start.tv_sec) * 1000.0 +
(end.tv_usec - start.tv_usec) / 1000.0;
if (mselapsed > PROFILE_EVENTS)
log_android(ANDROID_LOG_WARN, "handle ip %f", mselapsed);
#endif
// Check if allowed
int allowed = 0;
struct allowed *redirect = NULL;
@ -339,14 +325,6 @@ void handle_ip(const struct arguments *args,
log_android(ANDROID_LOG_WARN, "Address v%d p%d %s/%u syn %d not allowed",
version, protocol, dest, dport, syn);
}
#ifdef PROFILE_EVENTS
gettimeofday(&end, NULL);
mselapsed = (end.tv_sec - start.tv_sec) * 1000.0 +
(end.tv_usec - start.tv_usec) / 1000.0;
if (mselapsed > PROFILE_EVENTS)
log_android(ANDROID_LOG_WARN, "handle protocol %f", mselapsed);
#endif
}
jint get_uid_retry(const int version, const int protocol,

4
app/src/main/jni/netguard/netguard.h
View File

@ -30,11 +30,11 @@
#define TAG "NetGuard.JNI"
// #define PROFILE_EVENTS 5
// #define PROFILE_UID 5
// #define PROFILE_JNI 5
#define SELECT_TIMEOUT 3600 // seconds
#define EPOLL_TIMEOUT 3600 // seconds
#define EPOLL_EVENTS 20
#define ICMP4_MAXMSG (IP_MAXPACKET - 20 - 8) // bytes (socket)
#define ICMP6_MAXMSG (IPV6_MAXPACKET - 40 - 8) // bytes (socket)

109
app/src/main/jni/netguard/session.c
View File

@ -132,7 +132,7 @@ void *handle_events(void *a) {
// Check sessions
time_t now = time(NULL);
int timeout = SELECT_TIMEOUT;
int timeout = EPOLL_TIMEOUT;
struct ng_session *sl = NULL;
s = ng_session;
while (s != NULL) {
@ -186,8 +186,8 @@ void *handle_events(void *a) {
isessions, usessions, tsessions, sessions, maxsessions, timeout);
// Poll
struct epoll_event ev;
int ready = epoll_wait(epoll_fd, &ev, 1, timeout * 1000);
struct epoll_event ev[EPOLL_EVENTS];
int ready = epoll_wait(epoll_fd, ev, EPOLL_EVENTS, timeout * 1000);
if (ready < 0) {
if (errno == EINTR) {
@ -207,69 +207,58 @@ void *handle_events(void *a) {
if (ready == 0)
log_android(ANDROID_LOG_DEBUG, "epoll timeout");
else {
if (ev.data.ptr != &ev_pipe) {
if (ev.data.ptr == NULL)
log_android(ANDROID_LOG_DEBUG, "epoll ready %d in %d out %d err %d hup %d",
ready,
(ev.events & EPOLLIN) != 0,
(ev.events & EPOLLOUT) != 0,
(ev.events & EPOLLERR) != 0,
(ev.events & EPOLLHUP) != 0);
else
log_android(ANDROID_LOG_DEBUG,
"epoll ready %d in %d out %d err %d hup %d prot %d sock %d",
ready,
(ev.events & EPOLLIN) != 0,
(ev.events & EPOLLOUT) != 0,
(ev.events & EPOLLERR) != 0,
(ev.events & EPOLLHUP) != 0,
((struct ng_session *) ev.data.ptr)->protocol,
((struct ng_session *) ev.data.ptr)->socket);
}
if (pthread_mutex_lock(&lock))
log_android(ANDROID_LOG_ERROR, "pthread_mutex_lock failed");
#ifdef PROFILE_EVENTS
struct timeval start, end;
float mselapsed;
gettimeofday(&start, NULL);
#endif
int error = 0;
if (ev.data.ptr == &ev_pipe) {
stopping = 1;
uint8_t buffer[1];
if (read(pipefds[0], buffer, 1) < 0)
log_android(ANDROID_LOG_WARN, "Read pipe error %d: %s", errno, strerror(errno));
else
log_android(ANDROID_LOG_WARN, "Read pipe");
for (int i = 0; i < ready; i++) {
if (ev[i].data.ptr == &ev_pipe) {
stopping = 1;
uint8_t buffer[1];
if (read(pipefds[0], buffer, 1) < 0)
log_android(ANDROID_LOG_WARN, "Read pipe error %d: %s",
errno, strerror(errno));
else
log_android(ANDROID_LOG_WARN, "Read pipe");
break;
} else if (ev.data.ptr == NULL) {
// Check upstream
if (check_tun(args, &ev, epoll_fd, sessions, maxsessions) < 0)
error = 1;
} else if (ev[i].data.ptr == NULL) {
log_android(ANDROID_LOG_DEBUG, "epoll ready %d/%d in %d out %d err %d hup %d",
i, ready,
(ev[i].events & EPOLLIN) != 0,
(ev[i].events & EPOLLOUT) != 0,
(ev[i].events & EPOLLERR) != 0,
(ev[i].events & EPOLLHUP) != 0);
} else {
#ifdef PROFILE_EVENTS
gettimeofday(&end, NULL);
mselapsed = (end.tv_sec - start.tv_sec) * 1000.0 +
(end.tv_usec - start.tv_usec) / 1000.0;
if (mselapsed > PROFILE_EVENTS)
log_android(ANDROID_LOG_WARN, "tun %f", mselapsed);
// Check upstream
if (check_tun(args, &ev[i], epoll_fd, sessions, maxsessions) < 0)
error = 1;
gettimeofday(&start, NULL);
#endif
} else {
log_android(ANDROID_LOG_DEBUG,
"epoll ready %d/%d in %d out %d err %d hup %d prot %d sock %d",
i, ready,
(ev[i].events & EPOLLIN) != 0,
(ev[i].events & EPOLLOUT) != 0,
(ev[i].events & EPOLLERR) != 0,
(ev[i].events & EPOLLHUP) != 0,
((struct ng_session *) ev[i].data.ptr)->protocol,
((struct ng_session *) ev[i].data.ptr)->socket);
// Check downstream
struct ng_session *session = (struct ng_session *) ev.data.ptr;
if (session->protocol == IPPROTO_ICMP || session->protocol == IPPROTO_ICMPV6)
check_icmp_socket(args, &ev);
else if (session->protocol == IPPROTO_UDP)
check_udp_socket(args, &ev);
else if (session->protocol == IPPROTO_TCP)
check_tcp_socket(args, &ev, epoll_fd);
// Check downstream
struct ng_session *session = (struct ng_session *) ev[i].data.ptr;
if (session->protocol == IPPROTO_ICMP || session->protocol == IPPROTO_ICMPV6)
check_icmp_socket(args, &ev[i]);
else if (session->protocol == IPPROTO_UDP)
check_udp_socket(args, &ev[i]);
else if (session->protocol == IPPROTO_TCP)
check_tcp_socket(args, &ev[i], epoll_fd);
}
if (error)
break;
}
if (pthread_mutex_unlock(&lock))
@ -277,14 +266,6 @@ void *handle_events(void *a) {
if (error)
break;
#ifdef PROFILE_EVENTS
gettimeofday(&end, NULL);
mselapsed = (end.tv_sec - start.tv_sec) * 1000.0 +
(end.tv_usec - start.tv_usec) / 1000.0;
if (mselapsed > PROFILE_EVENTS)
log_android(ANDROID_LOG_WARN, "sockets %f", mselapsed);
#endif
}
}