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-28 10:25:04 -0500
commitbe7afe658e5fc6745a369d6fb3fbc4bb6037da18 (patch)
tree06d023f94d4686d27a91b04f28ccbeb9061f761c /src/core/or/connection_edge.c
parentee38514cc4372bfb7d01ee96a1110d600a30e061 (diff)
downloadtor-be7afe658e5fc6745a369d6fb3fbc4bb6037da18.tar.gz
tor-be7afe658e5fc6745a369d6fb3fbc4bb6037da18.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 d9067d5c29..b96f4eb211 100644
--- a/src/core/or/connection_edge.c
+++ b/src/core/or/connection_edge.c
@@ -546,7 +546,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;
}
@@ -911,7 +911,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);