aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-11-15 12:17:36 -0500
committerNick Mathewson <nickm@torproject.org>2012-11-15 12:17:36 -0500
commita4fce0fee855288d600636462f1ca9acf30e036f (patch)
treecc4580877499c273e11d9e01b5db116c993bdd12
parent12f997528d17739290a54347edd2ce54042efa2d (diff)
downloadtor-a4fce0fee855288d600636462f1ca9acf30e036f.tar
tor-a4fce0fee855288d600636462f1ca9acf30e036f.tar.gz
Remove some XXXX commens in dns.c
Previously, I was freaking out about passing an unspec address to dns_found_answer() on an error, since I was using the address type to determine whether the error was an error on an ipv4 address lookup or on an ipv6 address lookup. But now dns_found_answer() has a separate orig_query_type argument to tell what kind of query it is, so there's no need to freak out.
-rw-r--r--src/or/dns.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/dns.c b/src/or/dns.c
index 9834bd74c..870494a93 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -1580,7 +1580,7 @@ evdns_callback(int result, char type, int count, int ttl, void *addresses,
const char *hostname = NULL;
int was_wildcarded = 0;
- tor_addr_make_unspec(&addr); /*WRONG WRONG WRONG XXXX XXXXX IPV6 prop208*/
+ tor_addr_make_unspec(&addr);
/* Keep track of whether IPv6 is working */
if (type == DNS_IPv6_AAAA) {
@@ -1615,7 +1615,7 @@ evdns_callback(int result, char type, int count, int ttl, void *addresses,
safe_str(escaped_address),
escaped_safe_str(answer_buf));
was_wildcarded = 1;
- tor_addr_make_null(&addr, AF_INET); /* ???? */
+ tor_addr_make_unspec(&addr);
result = DNS_ERR_NOTEXIST;
} else {
log_debug(LD_EXIT, "eventdns said that %s resolves to %s",
@@ -1637,7 +1637,7 @@ evdns_callback(int result, char type, int count, int ttl, void *addresses,
safe_str(escaped_address),
escaped_safe_str(answer_buf));
was_wildcarded = 1;
- tor_addr_make_unspec(&addr); /* WRONG WRONG ETC XXXXXXXX */
+ tor_addr_make_unspec(&addr);
result = DNS_ERR_NOTEXIST;
} else {
log_debug(LD_EXIT, "eventdns said that %s resolves to %s",