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

Native fixed/simplified DNS compression

Browse source
This commit is contained in:
M66B 2016-01-24 14:54:38 +01:00
parent e204cbba50
commit c8aee09a93
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/app.iml
View file

@ -98,6 +98,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/objectFiles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />

21
app/src/main/jni/netguard/netguard.c
View file

@ -1105,25 +1105,22 @@ int check_dns(const struct arguments *args, const struct udp_session *u,
// http://tools.ietf.org/html/rfc1035
uint8_t len;
size_t ptr;
size_t qdoff = dataoff + sizeof(struct dns_header);
do {
len = *(buffer + qdoff);
if (len <= 0x3F) {
ptr = qdoff;
qdoff += (1 + len);
} else {
if (len >= 0x40) {
// TODO test
// TODO check top 2 bits
ptr = dataoff + (len & 0x3F) * 256 + *(buffer + qdoff + 1);
len = *(buffer + ptr);
qdoff += 2;
qdoff = dataoff + (len & 0x3F) * 256 + *(buffer + qdoff + 1);
len = *(buffer + qdoff);
}
if (len && ptr + 1 + len <= dataoff + datalen) {
memcpy(name + noff, buffer + ptr + 1, len);
if (len && qdoff + 1 + len <= dataoff + datalen) {
memcpy(name + noff, buffer + qdoff + 1, len);
*(name + noff + len) = '.';
noff += (len + 1);
qdoff += (1 + len);
}
} while (len && ptr + 1 + len <= dataoff + datalen);
} while (len && qdoff + 1 + len <= dataoff + datalen);
if (noff > 0 && qdoff + 4 <= dataoff + datalen) {
*(name + noff - 1) = 0;
@ -1131,6 +1128,8 @@ int check_dns(const struct arguments *args, const struct udp_session *u,
uint16_t qclass = ntohs(*((uint16_t *) (buffer + qdoff + 2)));
qdoff += 4;
log_android(ANDROID_LOG_INFO, "DNS type %d class %d name %s", qtype, qclass, name);
if (qtype == DNS_QTYPE_A && qclass == DNS_QCLASS_IN)
for (int i = 0; i < args->hcount; i++)
if (!strcmp(name, args->hosts[i])) {