[tor-commits] [tor/maint-0.2.9] Initialise DNS TTL for A and AAAA records.

[nickm at torproject.org]

commit eae68fa2d2bde931bf8b9115f7a9cb7a0f0c9073
Author: Philipp Winter <phw at nymity.ch>
Date:   Wed Jul 27 12:01:03 2016 -0400

    Initialise DNS TTL for A and AAAA records.
    
    So far, the TTLs for both A and AAAA records were not initialised,
    resulting in exit relays sending back the value 60 to Tor clients.  This
    also impacts exit relays' DNS cache -- the expiry time for all domains
    is set to 60.
    
    This fixes <https://bugs.torproject.org/19025>.
---
 src/or/dns.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/or/dns.c b/src/or/dns.c
index 41a6dfd0a..e007a402f 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -326,7 +326,7 @@ cached_resolve_add_answer(cached_resolve_t *resolve,
       resolve->result_ipv4.err_ipv4 = dns_result;
       resolve->res_status_ipv4 = RES_STATUS_DONE_ERR;
     }
-
+    resolve->ttl_ipv4 = ttl;
   } else if (query_type == DNS_IPv6_AAAA) {
     if (resolve->res_status_ipv6 != RES_STATUS_INFLIGHT)
       return;
@@ -341,6 +341,7 @@ cached_resolve_add_answer(cached_resolve_t *resolve,
       resolve->result_ipv6.err_ipv6 = dns_result;
       resolve->res_status_ipv6 = RES_STATUS_DONE_ERR;
     }
+    resolve->ttl_ipv6 = ttl;
   }
 }