diff options
| author | David Goulet <dgoulet@torproject.org> | 2022-11-09 15:35:58 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2022-11-09 15:35:58 -0500 |
| commit | f39f8b30f47783d932a78152b84ace535b211cc7 (patch) | |
| tree | e1f39ce2df75032f316eed0d324bfea6e0c4a1d6 /src/feature/relay/dns.c | |
| parent | 560d44b08bbd00ef813b03202b98124901f17a9d (diff) | |
| parent | e2a94e050d9e4d4ab654503d8fec49e5d151cdbf (diff) | |
| download | tor-f39f8b30f47783d932a78152b84ace535b211cc7.tar.gz tor-f39f8b30f47783d932a78152b84ace535b211cc7.zip | |
Merge branch 'maint-0.4.7'
Diffstat (limited to 'src/feature/relay/dns.c')
| -rw-r--r-- | src/feature/relay/dns.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c index be226f4815..9d50fa7c31 100644 --- a/src/feature/relay/dns.c +++ b/src/feature/relay/dns.c @@ -512,7 +512,7 @@ send_resolved_cell,(edge_connection_t *conn, uint8_t answer_type, uint32_t ttl; buf[0] = answer_type; - ttl = clip_dns_ttl(conn->address_ttl); + ttl = conn->address_ttl; switch (answer_type) { @@ -584,7 +584,7 @@ send_resolved_hostname_cell,(edge_connection_t *conn, size_t namelen = strlen(hostname); tor_assert(namelen < 256); - ttl = clip_dns_ttl(conn->address_ttl); + ttl = conn->address_ttl; buf[0] = RESOLVED_TYPE_HOSTNAME; buf[1] = (uint8_t)namelen; @@ -1310,7 +1310,7 @@ make_pending_resolve_cached(cached_resolve_t *resolve) resolve->ttl_hostname < ttl) ttl = resolve->ttl_hostname; - set_expiry(new_resolve, time(NULL) + clip_dns_ttl(ttl)); + set_expiry(new_resolve, time(NULL) + ttl); } assert_cache_ok(); @@ -1725,7 +1725,7 @@ evdns_callback(int result, char type, int count, int ttl, void *addresses, } if (result != DNS_ERR_SHUTDOWN) dns_found_answer(string_address, orig_query_type, - result, &addr, hostname, ttl); + result, &addr, hostname, clip_dns_fuzzy_ttl(ttl)); /* The result can be changed within this function thus why we note the result * at the end. */ |