summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug104684
-rw-r--r--src/or/dnsserv.c10
2 files changed, 14 insertions, 0 deletions
diff --git a/changes/bug10468 b/changes/bug10468
new file mode 100644
index 0000000000..128eb3ac65
--- /dev/null
+++ b/changes/bug10468
@@ -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.
diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c
index ebff7b524c..4190e9cc23 100644
--- a/src/or/dnsserv.c
+++ b/src/or/dnsserv.c
@@ -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));