nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/bug10468_024'

Browse Source
This commit is contained in:
Nick Mathewson 2014-04-01 21:50:55 -04:00
commit 86f619d0d3
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug10468 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes:
- When using DNSPort and AutomapHostsOnResolve, respond to AAAA
requests with AAAA automapped answers. Fixes bug 10468; bugfix
on 0.2.4.7-alpha.

10
src/or/dnsserv.c
View File

@ -131,6 +131,16 @@ evdns_server_callback(struct evdns_server_request *req, void *data_)
else
entry_conn->socks_request->command = SOCKS_COMMAND_RESOLVE_PTR;
if (q->type == EVDNS_TYPE_A) {
entry_conn->ipv4_traffic_ok = 1;
entry_conn->ipv6_traffic_ok = 0;
entry_conn->prefer_ipv6_traffic = 0;
} else if (q->type == EVDNS_TYPE_AAAA) {
entry_conn->ipv4_traffic_ok = 0;
entry_conn->ipv6_traffic_ok = 1;
entry_conn->prefer_ipv6_traffic = 1;
}
strlcpy(entry_conn->socks_request->address, q->name,
sizeof(entry_conn->socks_request->address));