aboutsummaryrefslogtreecommitdiff
path: root/src/core/or/connection_edge.c
diff options
context:
space:
mode:
authorRasmus Dahlberg <rasmus@mullvad.net>2022-10-12 20:29:11 +0200
committerDavid Goulet <dgoulet@torproject.org>2022-11-01 09:29:19 -0400
commit0fe2096144104e63d403896844af121c9622a7a8 (patch)
treee7dfb5e73e9d877c855d3160947b6c03de849a64 /src/core/or/connection_edge.c
parent619dd35321c13684d5496b660a3404d2d3fe2827 (diff)
downloadtor-0fe2096144104e63d403896844af121c9622a7a8.tar.gz
tor-0fe2096144104e63d403896844af121c9622a7a8.zip
Clip DNS TTL values once in event callback
This change ensures that other parts of the code base always operate on the same clipped TTL values, notably without being aware of clipping.
Diffstat (limited to 'src/core/or/connection_edge.c')
-rw-r--r--src/core/or/connection_edge.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c
index 5ef7a0982b..d071bf8937 100644
--- a/src/core/or/connection_edge.c
+++ b/src/core/or/connection_edge.c
@@ -532,7 +532,7 @@ connection_edge_end(edge_connection_t *conn, uint8_t reason)
memcpy(payload+1, tor_addr_to_in6_addr8(&conn->base_.addr), 16);
addrlen = 16;
}
- set_uint32(payload+1+addrlen, htonl(clip_dns_ttl(conn->address_ttl)));
+ set_uint32(payload+1+addrlen, htonl(conn->address_ttl));
payload_len += 4+addrlen;
}
@@ -926,7 +926,7 @@ connected_cell_format_payload(uint8_t *payload_out,
return -1;
}
- set_uint32(payload_out + connected_payload_len, htonl(clip_dns_ttl(ttl)));
+ set_uint32(payload_out + connected_payload_len, htonl(ttl));
connected_payload_len += 4;
tor_assert(connected_payload_len <= MAX_CONNECTED_CELL_PAYLOAD_LEN);