|
@@ -132,7 +132,7 @@ evdns_server_callback(struct evdns_server_request *req, void *data_)
|
|
|
|
|
|
tor_addr_copy(&TO_CONN(conn)->addr, &tor_addr);
|
|
tor_addr_copy(&TO_CONN(conn)->addr, &tor_addr);
|
|
TO_CONN(conn)->port = port;
|
|
TO_CONN(conn)->port = port;
|
|
- TO_CONN(conn)->address = tor_dup_addr(&tor_addr);
|
|
|
|
|
|
+ TO_CONN(conn)->address = tor_addr_to_str_dup(&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) {
|
|
q->type == EVDNS_QTYPE_ALL) {
|
|
@@ -207,7 +207,7 @@ dnsserv_launch_request(const char *name, int reverse,
|
|
tor_addr_copy(&TO_CONN(conn)->addr, &control_conn->base_.addr);
|
|
tor_addr_copy(&TO_CONN(conn)->addr, &control_conn->base_.addr);
|
|
#ifdef AF_UNIX
|
|
#ifdef AF_UNIX
|
|
/*
|
|
/*
|
|
- * The control connection can be AF_UNIX and if so tor_dup_addr will
|
|
|
|
|
|
+ * The control connection can be AF_UNIX and if so tor_addr_to_str_dup will
|
|
* unhelpfully say "<unknown address type>"; say "(Tor_internal)"
|
|
* unhelpfully say "<unknown address type>"; say "(Tor_internal)"
|
|
* instead.
|
|
* instead.
|
|
*/
|
|
*/
|
|
@@ -216,11 +216,11 @@ dnsserv_launch_request(const char *name, int reverse,
|
|
TO_CONN(conn)->address = tor_strdup("(Tor_internal)");
|
|
TO_CONN(conn)->address = tor_strdup("(Tor_internal)");
|
|
} else {
|
|
} else {
|
|
TO_CONN(conn)->port = control_conn->base_.port;
|
|
TO_CONN(conn)->port = control_conn->base_.port;
|
|
- TO_CONN(conn)->address = tor_dup_addr(&control_conn->base_.addr);
|
|
|
|
|
|
+ TO_CONN(conn)->address = tor_addr_to_str_dup(&control_conn->base_.addr);
|
|
}
|
|
}
|
|
#else
|
|
#else
|
|
TO_CONN(conn)->port = control_conn->base_.port;
|
|
TO_CONN(conn)->port = control_conn->base_.port;
|
|
- TO_CONN(conn)->address = tor_dup_addr(&control_conn->base_.addr);
|
|
|
|
|
|
+ TO_CONN(conn)->address = tor_addr_to_str_dup(&control_conn->base_.addr);
|
|
#endif
|
|
#endif
|
|
|
|
|
|
if (reverse)
|
|
if (reverse)
|