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

Native forwarding fixes

This commit is contained in:
M66B 2016-02-06 12:54:44 +01:00
parent f5a47dee6f
commit 1831f2f961
1 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1555,10 +1555,15 @@ void handle_ip(const struct arguments *args, const uint8_t *pkt, const size_t le
}
flags[flen] = 0;
struct port_forward *fwd53 = port_forward;
while (fwd53 != NULL && fwd53->source != 53)
fwd53 = fwd53->next;
// Get uid
jint uid = -1;
if (protocol == IPPROTO_ICMP || protocol == IPPROTO_ICMPV6 ||
(protocol == IPPROTO_UDP && dport != 53 && !has_udp_session(pkt, payload)) ||
(protocol == IPPROTO_UDP &&
(dport != 53 || fwd53 != NULL) && !has_udp_session(pkt, payload)) ||
(protocol == IPPROTO_TCP && syn)) {
log_android(ANDROID_LOG_INFO, "get uid %s/%u version %d protocol %d syn %d",
dest, dport, version, protocol, syn);
@ -1960,12 +1965,15 @@ jboolean handle_udp(const struct arguments *args,
struct port_forward *fwd = port_forward;
while (fwd != NULL && fwd->source != ntohs(udphdr->dest))
fwd = fwd->next;
if (fwd != NULL && fwd->uid != cur->uid) {
log_android(ANDROID_LOG_WARN, "TCP forward %u > %u uid %d",
if (fwd != NULL) {
if (fwd->uid == cur->uid)
log_android(ANDROID_LOG_WARN, "UDP passthrough %u uid %d", fwd->source, cur->uid);
else {
log_android(ANDROID_LOG_WARN, "UDP forward %u > %u uid %d",
fwd->source, fwd->target, cur->uid);
if (cur->version == 4) {
inet_pton(AF_INET, "127.0.0.1", &server4.sin_addr.s_addr);
inet_pton(AF_INET, "127.0.0.1", &server4.sin_addr);
server4.sin_port = htons(fwd->target);
}
else {
@ -1973,6 +1981,7 @@ jboolean handle_udp(const struct arguments *args,
server6.sin6_port = htons(fwd->target);
}
}
}
if (sendto(cur->socket, data, (socklen_t) datalen, MSG_NOSIGNAL,
(const struct sockaddr *) (version == 4 ? &server4 : &server6),
@ -2610,12 +2619,15 @@ int open_tcp_socket(const struct arguments *args, const struct tcp_session *cur)
struct port_forward *fwd = port_forward;
while (fwd != NULL && fwd->source != ntohs(cur->dest))
fwd = fwd->next;
if (fwd != NULL && fwd->uid != cur->uid) {
if (fwd != NULL) {
if (fwd->uid == cur->uid)
log_android(ANDROID_LOG_WARN, "TCP passthrough %u uid %d", fwd->source, cur->uid);
else {
log_android(ANDROID_LOG_WARN, "TCP forward %u > %u uid %d",
fwd->source, fwd->target, cur->uid);
if (cur->version == 4) {
inet_pton(AF_INET, "127.0.0.1", &addr4.sin_addr.s_addr);
inet_pton(AF_INET, "127.0.0.1", &addr4.sin_addr);
addr4.sin_port = htons(fwd->target);
}
else {
@ -2623,6 +2635,7 @@ int open_tcp_socket(const struct arguments *args, const struct tcp_session *cur)
addr6.sin6_port = htons(fwd->target);
}
}
}
// Initiate connect
int err = connect(sock,