diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-01 21:50:55 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-01 21:50:55 -0400 |
| commit | 86f619d0d34657e96d8ae3e83a197382bf6ba344 (patch) | |
| tree | 3338f063fff186d2ccab653c76a1893c28f0af7b /src/or | |
| parent | fc9e84062b73535b63bb3cf555604b1acbcc4c61 (diff) | |
| parent | 46a3914079d6aa91ef456b4bb82d9f842feb0976 (diff) | |
| download | tor-86f619d0d34657e96d8ae3e83a197382bf6ba344.tar tor-86f619d0d34657e96d8ae3e83a197382bf6ba344.tar.gz | |
Merge remote-tracking branch 'public/bug10468_024'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/dnsserv.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index ebff7b524..4190e9cc2 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)); |