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

Handle multiple qnames

This commit is contained in:
M66B 2017-03-04 13:57:06 +01:00
parent cba57ade18
commit ab8df1cebb
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/jni/netguard/dns.c
View File

@ -78,20 +78,25 @@ void parse_dns_response(const struct arguments *args, const struct udp_session *
log_android(ANDROID_LOG_WARN, "DNS response qcount %d acount %d", qcount, acount);
// http://tools.ietf.org/html/rfc1035
char name[DNS_QNAME_MAX + 1];
int32_t off = sizeof(struct dns_header);
uint16_t qtype;
uint16_t qclass;
char qname[DNS_QNAME_MAX + 1];
// TODO multiple qnames?
for (int q = 0; q < 1; q++) {
off = get_qname(data, *datalen, (uint16_t) off, qname);
off = get_qname(data, *datalen, (uint16_t) off, name);
if (off > 0 && off + 4 <= *datalen) {
qtype = ntohs(*((uint16_t *) (data + off)));
qclass = ntohs(*((uint16_t *) (data + off + 2)));
log_android(ANDROID_LOG_DEBUG,
"DNS question %d qtype %d qclass %d qname %s", q, qtype, qclass, qname);
// TODO multiple qnames?
if (q == 0) {
strcpy(qname, name);
qtype = ntohs(*((uint16_t *) (data + off)));
qclass = ntohs(*((uint16_t *) (data + off + 2)));
log_android(ANDROID_LOG_DEBUG,
"DNS question %d qtype %d qclass %d qname %s",
q, qtype, qclass, qname);
}
off += 4;
}
else {
@ -101,7 +106,6 @@ void parse_dns_response(const struct arguments *args, const struct udp_session *
}
}
char name[DNS_QNAME_MAX + 1];
for (int a = 0; a < acount; a++) {
off = get_qname(data, *datalen, (uint16_t) off, name);
if (off > 0 && off + 10 <= *datalen) {

1
app/src/main/jni/netguard/tcp.c
View File

@ -1183,6 +1183,7 @@ int write_fin_ack(const struct arguments *args, struct tcp_session *cur) {
}
void write_rst(const struct arguments *args, struct tcp_session *cur) {
// https://www.snellman.net/blog/archive/2016-02-01-tcp-rst/
int ack = 0;
if (cur->state == TCP_LISTEN) {
ack = 1;