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

Native UDP state

This commit is contained in:
M66B 2016-01-21 13:43:41 +01:00
parent c28e6013c6
commit 599ab57944
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/jni/netguard/netguard.c
View File

@ -363,8 +363,8 @@ void check_sessions(const struct arguments *args) {
struct udp_session *ul = NULL;
struct udp_session *u = udp_session;
while (u != NULL) {
if (u->time + UDP_TIMEOUT < now) {
log_android(ANDROID_LOG_INFO, "UDP timeout");
if (u->error || u->time + UDP_TIMEOUT < now) {
log_android(ANDROID_LOG_WARN, "UDP timeout");
if (close(u->socket))
log_android(ANDROID_LOG_ERROR, "UDP close error %d: %s", errno, strerror(errno));
@ -537,7 +537,7 @@ void check_udp_sockets(const struct arguments *args, fd_set *rfds, fd_set *wfds,
else if (serr)
log_android(ANDROID_LOG_ERROR, "UDP SO_ERROR %d: %s", serr, strerror(serr));
// TODO state
cur->error = 1;
}
else {
// Check socket read
@ -550,11 +550,12 @@ void check_udp_sockets(const struct arguments *args, fd_set *rfds, fd_set *wfds,
// Socket error
log_android(ANDROID_LOG_ERROR, "UDP recv error %d: %s", errno, strerror(errno));
if (errno != EINTR); // TODO state
if (errno != EINTR)
cur->error = 1;
}
else if (bytes == 0) {
// Socket eof
log_android(ANDROID_LOG_INFO, "UDP recv empty");
log_android(ANDROID_LOG_WARN, "UDP recv empty");
// TODO state
} else {
@ -887,6 +888,7 @@ jboolean handle_udp(const struct arguments *args, const uint8_t *buffer, uint16_
u->source = udphdr->source;
u->daddr = iphdr->daddr;
u->dest = udphdr->dest;
u->error = 0;
u->next = NULL;
// Open UDP socket

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

@ -36,6 +36,7 @@ struct udp_session {
__be16 source; // network notation
int32_t daddr; // network notation
__be16 dest; // network notation
uint8_t error;
jint socket;
struct udp_session *next;
};