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

Try to get uid only once

Browse source
This commit is contained in:
M66B 2017-04-10 10:55:00 +02:00
parent 0882f40c73
commit c464c3bc67
2 changed files with 24 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
app/src/main/jni/netguard/ip.c
View file

@ -290,7 +290,7 @@ void handle_ip(const struct arguments *args,
if (protocol == IPPROTO_ICMP || protocol == IPPROTO_ICMPV6 || if (protocol == IPPROTO_ICMP || protocol == IPPROTO_ICMPV6 ||
(protocol == IPPROTO_UDP && !has_udp_session(args, pkt, payload)) || (protocol == IPPROTO_UDP && !has_udp_session(args, pkt, payload)) ||
(protocol == IPPROTO_TCP && syn)) (protocol == IPPROTO_TCP && syn))
uid = get_uid_retry(version, protocol, saddr, sport, daddr, dport); uid = get_uid(version, protocol, saddr, sport, daddr, dport);
log_android(ANDROID_LOG_DEBUG, log_android(ANDROID_LOG_DEBUG,
"Packet v%d %s/%u > %s/%u proto %d flags %s uid %d", "Packet v%d %s/%u > %s/%u proto %d flags %s uid %d",
@ -332,39 +332,29 @@ void handle_ip(const struct arguments *args,
} }
} }
jint get_uid_retry(const int version, const int protocol, jint get_uid(const int version, const int protocol,
const void *saddr, const uint16_t sport, const void *saddr, const uint16_t sport,
const void *daddr, const uint16_t dport) { const void *daddr, const uint16_t dport) {
jint uid = -1;
char dest[INET6_ADDRSTRLEN + 1]; char dest[INET6_ADDRSTRLEN + 1];
inet_ntop(version == 4 ? AF_INET : AF_INET6, daddr, dest, sizeof(dest)); inet_ntop(version == 4 ? AF_INET : AF_INET6, daddr, dest, sizeof(dest));
log_android(ANDROID_LOG_INFO, "get uid v%d p%d %u > %s/%u", log_android(ANDROID_LOG_INFO, "get uid v%d p%d %u > %s/%u",
version, protocol, sport, dest, dport); version, protocol, sport, dest, dport);
jint uid = -1; // Check IPv6 table first
int tries = 0; if (version == 4) {
usleep(1000 * UID_DELAY); int8_t daddr128[16];
while (uid < 0 && tries++ < UID_MAXTRY) { memset(daddr128, 0, 10);
// Check IPv6 table first daddr128[10] = (uint8_t) 0xFF;
if (version == 4) { daddr128[11] = (uint8_t) 0xFF;
int8_t daddr128[16]; memcpy(daddr128 + 12, daddr, 4);
memset(daddr128, 0, 10); uid = get_uid_sub(6, protocol, saddr, sport, daddr128, dport);
daddr128[10] = (uint8_t) 0xFF;
daddr128[11] = (uint8_t) 0xFF;
memcpy(daddr128 + 12, daddr, 4);
uid = get_uid(6, protocol, saddr, sport, daddr128, dport);
}
if (uid < 0)
uid = get_uid(version, protocol, saddr, sport, daddr, dport);
// Retry delay
if (uid < 0 && tries < UID_MAXTRY) {
log_android(ANDROID_LOG_WARN, "get uid v%d p%d %u > %s/%u try %d",
version, protocol, sport, dest, dport, tries);
usleep(1000 * UID_DELAYTRY);
}
} }
if (uid < 0)
uid = get_uid_sub(version, protocol, saddr, sport, daddr, dport);
if (uid < 0) if (uid < 0)
log_android(ANDROID_LOG_ERROR, "uid v%d p%d %u > %s/%u not found", log_android(ANDROID_LOG_ERROR, "uid v%d p%d %u > %s/%u not found",
version, protocol, sport, dest, dport); version, protocol, sport, dest, dport);
@ -372,9 +362,9 @@ jint get_uid_retry(const int version, const int protocol,
return uid; return uid;
} }
jint get_uid(const int version, const int protocol, jint get_uid_sub(const int version, const int protocol,
const void *saddr, const uint16_t sport, const void *saddr, const uint16_t sport,
const void *daddr, const uint16_t dport) { const void *daddr, const uint16_t dport) {
char line[250]; char line[250];
char hex[16 * 2 + 1]; char hex[16 * 2 + 1];
int fields; int fields;

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

@ -55,10 +55,6 @@
#define TCP_KEEP_TIMEOUT 300 // seconds #define TCP_KEEP_TIMEOUT 300 // seconds
// https://en.wikipedia.org/wiki/Maximum_segment_lifetime // https://en.wikipedia.org/wiki/Maximum_segment_lifetime
#define UID_DELAY 1 // milliseconds
#define UID_DELAYTRY 1 // milliseconds
#define UID_MAXTRY 1
#define SOCKS5_NONE 1 #define SOCKS5_NONE 1
#define SOCKS5_HELLO 2 #define SOCKS5_HELLO 2
#define SOCKS5_AUTH 3 #define SOCKS5_AUTH 3
@ -452,14 +448,14 @@ uint8_t char2nible(const char c);
void hex2bytes(const char *hex, uint8_t *buffer); void hex2bytes(const char *hex, uint8_t *buffer);
jint get_uid_retry(const int version, const int protocol,
const void *saddr, const uint16_t sport,
const void *daddr, const uint16_t dport);
jint get_uid(const int version, const int protocol, jint get_uid(const int version, const int protocol,
const void *saddr, const uint16_t sport, const void *saddr, const uint16_t sport,
const void *daddr, const uint16_t dport); const void *daddr, const uint16_t dport);
jint get_uid_sub(const int version, const int protocol,
const void *saddr, const uint16_t sport,
const void *daddr, const uint16_t dport);
int protect_socket(const struct arguments *args, int socket); int protect_socket(const struct arguments *args, int socket);
uint16_t calc_checksum(uint16_t start, const uint8_t *buffer, size_t length); uint16_t calc_checksum(uint16_t start, const uint8_t *buffer, size_t length);