1 files changed, 33 insertions, 22 deletions

diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c
index f8b5c3cdd2..8222c8b45d 100644
--- a/src/or/dnsserv.c
+++ b/src/or/dnsserv.c
@@ -9,7 +9,21 @@
  **/
 
 #include "or.h"
+#include "dnsserv.h"
+#include "config.h"
+#include "connection.h"
+#include "connection_edge.h"
+#include "control.h"
+#include "main.h"
+#include "policies.h"
+#ifdef HAVE_EVENT2_DNS_H
+#include <event2/dns.h>
+#include <event2/dns_compat.h>
+/* XXXX022 this implies we want an improved evdns  */
+#include <event2/dns_struct.h>
+#else
 #include "eventdns.h"
+#endif
 
 /** Helper function: called by evdns whenever the client sends a request to our
  * DNSPort.  We need to eventually answer the request <b>req</b>.
@@ -85,12 +99,7 @@ evdns_server_callback(struct evdns_server_request *req, void *_data)
     evdns_server_request_respond(req, DNS_ERR_NONE);
     return;
   }
-  if (q->type == EVDNS_TYPE_A) {
-    /* Refuse any attempt to resolve a noconnect address, right now. */
-    if (hostname_is_noconnect_address(q->name)) {
-      err = DNS_ERR_REFUSED;
-    }
-  } else {
+  if (q->type != EVDNS_TYPE_A) {
     tor_assert(q->type == EVDNS_TYPE_PTR);
   }
 
@@ -132,17 +141,18 @@ evdns_server_callback(struct evdns_server_request *req, void *_data)
 
   control_event_stream_status(conn, STREAM_EVENT_NEW, 0);
 
-  /* Now, throw the connection over to get rewritten (which will answer it
-  * immediately if it's in the cache, or completely bogus, or automapped),
-  * and then attached to a circuit. */
+  /* Now, unless a controller asked us to leave streams unattached,
+  * throw the connection over to get rewritten (which will
+  * answer it immediately if it's in the cache, or completely bogus, or
+  * automapped), and then attached to a circuit. */
   log_info(LD_APP, "Passing request for %s to rewrite_and_attach.",
-           escaped_safe_str(q->name));
+           escaped_safe_str_client(q->name));
   q_name = tor_strdup(q->name); /* q could be freed in rewrite_and_attach */
-  connection_ap_handshake_rewrite_and_attach(conn, NULL, NULL);
+  connection_ap_rewrite_and_attach_if_allowed(conn, NULL, NULL);
   /* Now, the connection is marked if it was bad. */
 
-  log_info(LD_APP, "Passed request for %s to rewrite_and_attach.",
-           escaped_safe_str(q_name));
+  log_info(LD_APP, "Passed request for %s to rewrite_and_attach_if_allowed.",
+           escaped_safe_str_client(q_name));
   tor_free(q_name);
 }
 
@@ -177,17 +187,18 @@ dnsserv_launch_request(const char *name, int reverse)
     return -1;
   }
 
-  /* Now, throw the connection over to get rewritten (which will answer it
-  * immediately if it's in the cache, or completely bogus, or automapped),
-  * and then attached to a circuit. */
+  /* Now, unless a controller asked us to leave streams unattached,
+  * throw the connection over to get rewritten (which will
+  * answer it immediately if it's in the cache, or completely bogus, or
+  * automapped), and then attached to a circuit. */
   log_info(LD_APP, "Passing request for %s to rewrite_and_attach.",
-           escaped_safe_str(name));
+           escaped_safe_str_client(name));
   q_name = tor_strdup(name); /* q could be freed in rewrite_and_attach */
-  connection_ap_handshake_rewrite_and_attach(conn, NULL, NULL);
+  connection_ap_rewrite_and_attach_if_allowed(conn, NULL, NULL);
   /* Now, the connection is marked if it was bad. */
 
-  log_info(LD_APP, "Passed request for %s to rewrite_and_attach.",
-           escaped_safe_str(q_name));
+  log_info(LD_APP, "Passed request for %s to rewrite_and_attach_if_allowed.",
+           escaped_safe_str_client(q_name));
   tor_free(q_name);
   return 0;
 }
@@ -298,8 +309,8 @@ dnsserv_configure_listener(connection_t *conn)
   tor_assert(conn->s >= 0);
   tor_assert(conn->type == CONN_TYPE_AP_DNS_LISTENER);
 
-  conn->dns_server_port = evdns_add_server_port(conn->s, 0,
-                                                evdns_server_callback, NULL);
+  conn->dns_server_port =
+    tor_evdns_add_server_port(conn->s, 0, evdns_server_callback, NULL);
 }
 
 /** Free the evdns server port for <b>conn</b>, which must be an