From: Nick Mathewson Date: Thu, 15 Nov 2012 17:17:36 +0000 (-0500) Subject: Remove some XXXX commens in dns.c X-Git-Tag: tor-0.2.4.7-alpha~35^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4fce0fee855288d600636462f1ca9acf30e036f;p=thirdparty%2Ftor.git 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. --- diff --git a/src/or/dns.c b/src/or/dns.c index 9834bd74c7..870494a937 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",