1 files changed, 33 insertions, 14 deletions

diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c
index ebff7b524c..f7710908bd 100644
--- a/src/or/dnsserv.c
+++ b/src/or/dnsserv.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2013, The Tor Project, Inc. */
+/* Copyright (c) 2007-2015, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
@@ -35,7 +35,7 @@ evdns_server_callback(struct evdns_server_request *req, void *data_)
   entry_connection_t *entry_conn;
   edge_connection_t *conn;
   int i = 0;
-  struct evdns_server_question *q = NULL;
+  struct evdns_server_question *q = NULL, *supported_q = NULL;
   struct sockaddr_storage addr;
   struct sockaddr *sa;
   int addrlen;
@@ -87,31 +87,37 @@ evdns_server_callback(struct evdns_server_request *req, void *data_)
   for (i = 0; i < req->nquestions; ++i) {
     if (req->questions[i]->dns_question_class != EVDNS_CLASS_INET)
       continue;
+    if (! q)
+      q = req->questions[i];
     switch (req->questions[i]->type) {
       case EVDNS_TYPE_A:
       case EVDNS_TYPE_AAAA:
       case EVDNS_TYPE_PTR:
-        q = req->questions[i];
+        /* We always pick the first one of these questions, if there is
+           one. */
+        if (! supported_q)
+          supported_q = q;
+        break;
       default:
         break;
       }
   }
+  if (supported_q)
+    q = supported_q;
   if (!q) {
     log_info(LD_APP, "None of the questions we got were ones we're willing "
              "to support. Sending NOTIMPL.");
     evdns_server_request_respond(req, DNS_ERR_NOTIMPL);
     return;
   }
-  if (q->type != EVDNS_TYPE_A && q->type != EVDNS_TYPE_AAAA) {
-    tor_assert(q->type == EVDNS_TYPE_PTR);
-  }
 
   /* Make sure the name isn't too long: This should be impossible, I think. */
   if (err == DNS_ERR_NONE && strlen(q->name) > MAX_SOCKS_ADDR_LEN-1)
     err = DNS_ERR_FORMAT;
 
-  if (err != DNS_ERR_NONE) {
-    /* We got an error?  Then send back an answer immediately; we're done. */
+  if (err != DNS_ERR_NONE || !supported_q) {
+    /* We got an error?  There's no question we're willing to answer? Then
+     * send back an answer immediately; we're done. */
     evdns_server_request_respond(req, err);
     return;
   }
@@ -126,18 +132,31 @@ evdns_server_callback(struct evdns_server_request *req, void *data_)
   TO_CONN(conn)->port = port;
   TO_CONN(conn)->address = tor_dup_addr(&tor_addr);
 
-  if (q->type == EVDNS_TYPE_A || q->type == EVDNS_TYPE_AAAA)
+  if (q->type == EVDNS_TYPE_A || q->type == EVDNS_TYPE_AAAA ||
+      q->type == EVDNS_QTYPE_ALL) {
     entry_conn->socks_request->command = SOCKS_COMMAND_RESOLVE;
-  else
+  } else {
+    tor_assert(q->type == EVDNS_TYPE_PTR);
     entry_conn->socks_request->command = SOCKS_COMMAND_RESOLVE_PTR;
+  }
+
+  if (q->type == EVDNS_TYPE_A || q->type == EVDNS_QTYPE_ALL) {
+    entry_conn->entry_cfg.ipv4_traffic = 1;
+    entry_conn->entry_cfg.ipv6_traffic = 0;
+    entry_conn->entry_cfg.prefer_ipv6 = 0;
+  } else if (q->type == EVDNS_TYPE_AAAA) {
+    entry_conn->entry_cfg.ipv4_traffic = 0;
+    entry_conn->entry_cfg.ipv6_traffic = 1;
+    entry_conn->entry_cfg.prefer_ipv6 = 1;
+  }
 
   strlcpy(entry_conn->socks_request->address, q->name,
           sizeof(entry_conn->socks_request->address));
 
   entry_conn->socks_request->listener_type = listener->base_.type;
   entry_conn->dns_server_request = req;
-  entry_conn->isolation_flags = listener->isolation_flags;
-  entry_conn->session_group = listener->session_group;
+  entry_conn->entry_cfg.isolation_flags = listener->entry_cfg.isolation_flags;
+  entry_conn->entry_cfg.session_group = listener->entry_cfg.session_group;
   entry_conn->nym_epoch = get_signewnym_epoch();
 
   if (connection_add(ENTRY_TO_CONN(entry_conn)) < 0) {
@@ -213,9 +232,9 @@ dnsserv_launch_request(const char *name, int reverse,
 
   entry_conn->socks_request->listener_type = CONN_TYPE_CONTROL_LISTENER;
   entry_conn->original_dest_address = tor_strdup(name);
-  entry_conn->session_group = SESSION_GROUP_CONTROL_RESOLVE;
+  entry_conn->entry_cfg.session_group = SESSION_GROUP_CONTROL_RESOLVE;
   entry_conn->nym_epoch = get_signewnym_epoch();
-  entry_conn->isolation_flags = ISO_DEFAULT;
+  entry_conn->entry_cfg.isolation_flags = ISO_DEFAULT;
 
   if (connection_add(TO_CONN(conn))<0) {
     log_warn(LD_APP, "Couldn't register dummy connection for RESOLVE request");